compat: determine if reinit_completion() is present

Use HAVE_REINIT_COMPLETION to avoid duplicate definition.

Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>

diff --git a/config/rdma.m4 b/config/rdma.m4
index a804d3a7a8c53e8073c8110889fa7d80d2fb10e8..e2363bfc30f9a5c81e2244b27e0997a5e34e555f 100644 (file)
--- a/config/rdma.m4
+++ b/config/rdma.m4
@@ -2043,11 +2043,25 @@ AC_DEFUN([LINUX_CONFIG_COMPAT],
        ],[
                AC_MSG_RESULT(yes)
                AC_DEFINE(HAVE_IDR_NEW_INTERFACE, 1,
-                         [idr_Alloc is defined])
-       ],[
+                         [idr_Alloc is defined]) ],[
                AC_MSG_RESULT(no)
        ])
 
+       AC_MSG_CHECKING([if completion.h has reinit_completion])
+       LB_LINUX_TRY_COMPILE([
+               #include <linux/completion.h>
+       ],[
+               struct completion c;
+
+               reinit_completion(&c);
+               return 0;
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_REINIT_COMPLETION, 1,
+                         [reinit_completion is defined])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
 ])
 #
 # COMPAT_CONFIG_HEADERS

diff --git a/include/linux/compat-3.13.h b/include/linux/compat-3.13.h
index 9d405002ddda90e18bec746d8ce90633cc4f32e4..88ad581315798f33270a882ae9133b8e4df325f5 100644 (file)
--- a/include/linux/compat-3.13.h
+++ b/include/linux/compat-3.13.h
@@ -6,8 +6,8 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0))
 
-#ifndef CONFIG_COMPAT_IS_REINIT_COMPLETION
-#define CONFIG_COMPAT_IS_REINIT_COMPLETION
+#ifndef HAVE_REINIT_COMPLETION
+#define HAVE_REINIT_COMPLETION
 
 static inline void reinit_completion(struct completion *x)
 {