From: Mike Marciniszyn <mike.marciniszyn@intel.com>
Date: Wed, 4 Mar 2015 16:57:49 +0000 (-0500)
Subject: compat: determine if reinit_completion() is present
X-Git-Tag: vofed-3.18~19
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=70bfc3152e7efb47278b80fd8bebed3d639b9c8a;p=~emulex%2Ffor-vlad%2Fcompat.git

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 a804d3a..e2363bf 100644
--- 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 9d40500..88ad581 100644
--- 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)
 {