LU-2800 autoconf: remove LC_BIT_SPINLOCK_H test

bit_spinlock.h has been upstream since v2.6.17.
We can remove the test and the dead code.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: James Simmons <uja.ornl@gmail.com>
Change-Id: I2875ae150e58c6670a2b56ad56e2a101eb6676b7
Reviewed-on: http://review.whamcloud.com/5338
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 1ace1f6..90a26b3 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -235,26 +235,6 @@ AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE],
          ])
 
 #
-# added in 2.6.17
-#
-AC_DEFUN([LC_BIT_SPINLOCK_H],
-[LB_CHECK_FILE([$LINUX/include/linux/bit_spinlock.h],[
-       AC_MSG_CHECKING([if bit_spinlock.h can be compiled])
-       LB_LINUX_TRY_COMPILE([
-               #include <asm/processor.h>
-               #include <linux/spinlock.h>
-               #include <linux/bit_spinlock.h>
-       ],[],[
-               AC_MSG_RESULT([yes])
-               AC_DEFINE(HAVE_BIT_SPINLOCK_H, 1, [Kernel has bit_spinlock.h])
-       ],[
-               AC_MSG_RESULT([no])
-       ])
-],
-[])
-])
-
-#
 # LC_CAPA_CRYPTO
 #
 AC_DEFUN([LC_CAPA_CRYPTO],
@@ -1500,8 +1480,6 @@ AC_DEFUN([LC_PROG_LINUX],
          # RHEL4 patches
          LC_EXPORT_TRUNCATE_COMPLETE
 
-         LC_BIT_SPINLOCK_H
-
          LC_CAPA_CRYPTO
          LC_CONFIG_RMTCLIENT
          LC_CONFIG_GSS

diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h
index b04bd76..ff4ddc4 100644 (file)
--- a/lustre/include/linux/lustre_dlm.h
+++ b/lustre/include/linux/lustre_dlm.h
@@ -41,10 +41,8 @@
 
 #ifdef __KERNEL__
 # include <linux/proc_fs.h>
-# ifdef HAVE_BIT_SPINLOCK_H
-#  include <asm/processor.h>
-#  include <linux/bit_spinlock.h>
-# endif
+# include <asm/processor.h>
+# include <linux/bit_spinlock.h>
 #endif
 
 #endif