From e38fd7c0748b1491261f0cee902a746ee38d7a61 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Tue, 23 Jul 2013 08:35:28 -0400 Subject: [PATCH] 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 Signed-off-by: James Simmons Change-Id: I2875ae150e58c6670a2b56ad56e2a101eb6676b7 Reviewed-on: http://review.whamcloud.com/5338 Reviewed-by: Bob Glossman Tested-by: Hudson Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/autoconf/lustre-core.m4 | 22 ---------------------- lustre/include/linux/lustre_dlm.h | 6 ++---- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 1ace1f6..90a26b3 100644 --- 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 - #include - #include - ],[],[ - 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 --- a/lustre/include/linux/lustre_dlm.h +++ b/lustre/include/linux/lustre_dlm.h @@ -41,10 +41,8 @@ #ifdef __KERNEL__ # include -# ifdef HAVE_BIT_SPINLOCK_H -# include -# include -# endif +# include +# include #endif #endif -- 1.8.3.1