X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-linux.m4;h=832bd15071150cad21a5c9268f19300cd39bdacd;hp=b8a5c2e9da7791e18c1f14b8e481c69883712aef;hb=3fcceea0e301c51a29d641c287bd36302a706bbe;hpb=b0209c2d4d771eb1c728549483244a63e11a818e

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index b8a5c2e..832bd15 100644
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -157,7 +157,7 @@ AC_DEFUN([LB_LINUX_RELEASE], [
 			])
 		])
 		AS_IF([test "x$lb_cv_mainline_kernel_sig" = "xyes"], [
-			MAINLINE_KERNEL="yes"
+			RHEL_KERNEL="yes"
 			KERNEL_FOUND="yes"
 		])
 	])
@@ -174,7 +174,6 @@ AC_DEFUN([LB_LINUX_RELEASE], [
 		[KMP_MODDIR=$withval
 		 IN_KERNEL=''],[
 		AS_IF([test x$RHEL_KERNEL = xyes], [KMP_MODDIR="extra/kernel"],
-		      [test x$MAINLINE_KERNEL = xyes], [KMP_MODDIR="extra/kernel"],
 		      [test x$SUSE_KERNEL = xyes], [KMP_MODDIR="updates/kernel"],
 		      [test x$UBUNTU_KERNEL = xyes], [KMP_MODDIR="updates/kernel"],
 		      [test x$DEBIAN_KERNEL = xyes], [KMP_MODDIR="updates/kernel"],
@@ -545,6 +544,15 @@ m4_define([LB_LANG_PROGRAM],
 [
 #include <linux/kernel.h>
 #include <linux/module.h>
+
+#if defined(NEED_LOCKDEP_IS_HELD_DISCARD_CONST) \
+ && defined(CONFIG_LOCKDEP) \
+ && defined(lockdep_is_held)
+#undef lockdep_is_held
+	#define lockdep_is_held(lock) \
+		lock_is_held((struct lockdep_map *)&(lock)->dep_map)
+#endif
+
 $1
 int
 main (void)