[rds-commits] zab commits r185 - in trunk: . linux/net/rds

[svn-commits at oss.oracle.com]

Author: zab
Date: 2007-01-19 12:24:05 -0800 (Fri, 19 Jan 2007)
New Revision: 185

Modified:
   trunk/configure.in
   trunk/linux/net/rds/ib.h
Log:
Don't include <linux/mutex.h> if our --include wrapper is being used.


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-01-19 20:10:36 UTC (rev 184)
+++ trunk/configure.in	2007-01-19 20:24:05 UTC (rev 185)
@@ -94,7 +94,6 @@
 KERNEL_COMPAT_HEADER(gfp_t, linux/types.h linux/gfp.h)
 KERNEL_COMPAT_HEADER(kzalloc, linux/slab.h)
 KERNEL_COMPAT_HEADER(for_each_possible_cpu, linux/cpumask.h)
-KERNEL_COMPAT_HEADER(mutex_init, linux/mutex.h)
 
 GREP_KERNEL_INCLUDE([PR_RDS in linux/socket.h], linux/socket.h,
 	have_pf_rds=yes, , [PF_RDS])
@@ -150,6 +149,15 @@
 	KAPI_COMPAT_CFLAGS="-DKERNEL_HAS_INET_SK_RETURNING_INET_SOCK $KAPI_COMPAT_CFLAGS", ,
 	[struct inet_sock \*inet_sk])
 
+# old kernels need our mutex_init.h wrappers.  Some distros have their own mutex_init
+# that is only provided for compatibility, but nothing includes it.  So our ib_ stuff
+# has to specifically include it.  But our mutex_init compat doesn't provide the
+# header, so we put the include inside an ifndef HAS_MUTEX.
+GREP_KERNEL_INCLUDE([mutex_init], linux/mutex.h,
+	KAPI_COMPAT_CFLAGS="-DKERNEL_HAS_MUTEX_H $KAPI_COMPAT_CFLAGS",
+	KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS mutex_init.h",
+	[mutex_init])
+
 if test "x$enable_ib" == "xcheck"; then
 	GREP_KERNEL_INCLUDE([IB verbs header], rdma/ib_verbs.h,
 		enable_ib=yes, enable_ib=no,

Modified: trunk/linux/net/rds/ib.h
===================================================================
--- trunk/linux/net/rds/ib.h	2007-01-19 20:10:36 UTC (rev 184)
+++ trunk/linux/net/rds/ib.h	2007-01-19 20:24:05 UTC (rev 185)
@@ -1,7 +1,9 @@
 #ifndef _RDS_IB_H
 #define _RDS_IB_H 
 
+#ifdef KERNEL_HAS_MUTEX_H
 #include <linux/mutex.h>
+#endif /* KERNEL_HAS_MUTEX_H */
 
 #include <rdma/ib_verbs.h>
 #include <rdma/rdma_cm.h>