summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-03-13 14:38:03 +0200
committeriwlwifi publisher <>2024-04-17 13:38:42 +0000
commit2c8287feb45d36901ef02794e41bfbe6d9328745 (patch)
treeeade90dc77af0a142034d8cdbec9d7e1795ab265
parentdcf2bf8e1390a60cc18fb715e61f161fcd63e166 (diff)
downloadbackport-iwlwifi-2c8287feb45d36901ef02794e41bfbe6d9328745.tar.gz
[BUGFIX] backport: fix compilation of lockdep_assert()
This macro is supported starting from v5.15. Backport it for older kernels. type=bugfix fixes=Iae62d39b4eabbbb053fa9a59d283346241d69a07 ticket=none Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I8ec3ff76d2b09e193cefd309aa404f0f990e794e Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99010 Reviewed-by: Johannes Berg <johannes.berg@intel.com> tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99440 Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com> PerCI-Ready: Golan Ben Ami <golan.ben.ami@intel.com> x-iwlwifi-stack-dev: d9244ad4c7b85e9fa29dc06412314596155d6fad
-rw-r--r--backport-include/linux/lockdep.h4
-rw-r--r--versions2
2 files changed, 5 insertions, 1 deletions
diff --git a/backport-include/linux/lockdep.h b/backport-include/linux/lockdep.h
index 8295b0d491..07ba6ec80c 100644
--- a/backport-include/linux/lockdep.h
+++ b/backport-include/linux/lockdep.h
@@ -30,4 +30,8 @@ int lockdep_is_held(const void *);
#endif /* CONFIG_LOCKDEP */
#endif /* lockdep_assert_not_held */
+#if LINUX_VERSION_IS_LESS(5,15,0)
+#define lockdep_assert(cond) \
+ do { WARN_ON(debug_locks && !(cond)); } while (0)
+#endif
#endif /* __BACKPORT_LINUX_LOCKDEP_H */
diff --git a/versions b/versions
index e5460ab3c5..9b3db883dd 100644
--- a/versions
+++ b/versions
@@ -2,5 +2,5 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12029:0a0d6c3c"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12030:d9244ad4"
BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40"