LU-13590 kernel: new kernel [RHEL 7.9 3.10.0-1160.2.1.el7]

[fs/lustre-release.git] / config / lustre-build-linux.m4

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index 9040a81..890feb1 100644 (file)
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -544,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)
@@ -794,8 +803,8 @@ AC_DEFUN([LB2_LINUX_TEST_COMPILE_ALL], [
 # source is generated.
 #
 AC_DEFUN([LB2_LINUX_TEST_SRC], [
-       LB2_LINUX_CONFTEST_C([LB_LANG_PROGRAM([[$2]], [[$3]])], [$1])
-       LB2_LINUX_CONFTEST_MAKEFILE([$1], [$4], [$5])
+       LB2_LINUX_CONFTEST_C([LB_LANG_PROGRAM([[$2]], [[$3]])], [$1_pc])
+       LB2_LINUX_CONFTEST_MAKEFILE([$1_pc], [$4], [$5])
 ])
 
 #
@@ -806,8 +815,8 @@ AC_DEFUN([LB2_LINUX_TEST_SRC], [
 # $3 - run on failure (unable to compile)
 #
 AC_DEFUN([LB2_LINUX_TEST_RESULT], [
-       AS_IF([test -d ${TEST_DIR}/$1], [
-               AS_IF([test -f ${TEST_DIR}/$1/$1.ko], [$2], [$3])
+       AS_IF([test -d ${TEST_DIR}/$1_pc], [
+               AS_IF([test -f ${TEST_DIR}/$1_pc/$1_pc.ko], [$2], [$3])
        ], [
                AC_MSG_ERROR([
        *** No matching source for the "$1" test, check that