Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-13581 build: xarray and lockdep_is_held const clash
[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
..
832bd15
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>
[
#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)
$1
int
main (void)