summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArend van Spriel <arend.vanspriel@broadcom.com>2019-04-17 14:05:34 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-06-27 22:55:27 +0200
commit1cc5efe8e280d78b5552bfee88bdac257151d888 (patch)
tree54fc9377d66124e8283133451aee5a2896345191
parentccfdad2f499e125ce3f567b12492c176c9459927 (diff)
backport-include: add empty lockdep_map structure in lockdep.h
include/linux/rhashtable.h now uses struct lockdep_map unconditionally which is fine for upstream as lockdep.h defines an empty lockdep_map structure if CONFIG_LOCKDEP is not set. However, that is only true since kernel 4.15 so adding such definition in our lockdep.h to cover older kernels. Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
-rw-r--r--backport/backport-include/linux/lockdep.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/backport/backport-include/linux/lockdep.h b/backport/backport-include/linux/lockdep.h
index 5a5d0d0e..12b91b4f 100644
--- a/backport/backport-include/linux/lockdep.h
+++ b/backport/backport-include/linux/lockdep.h
@@ -14,4 +14,10 @@
#endif /* CONFIG_LOCKDEP */
#endif /* LINUX_VERSION_IS_LESS(3,9,0) */
+#if LINUX_VERSION_IS_LESS(4,15,0)
+#ifndef CONFIG_LOCKDEP
+struct lockdep_map { };
+#endif /* CONFIG_LOCKDEP */
+#endif /* LINUX_VERSION_IS_LESS(4,15,0) */
+
#endif /* __BACKPORT_LINUX_LOCKDEP_H */