diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-03-14 09:08:48 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:40:54 +0000 |
| commit | cff3352199fb6e8c9edbecc1b78d8cfc45b38b36 (patch) | |
| tree | 801971818d9921504d9c6d9aea5be234fa0081d9 | |
| parent | 71202c2c75b8cbbc8662ac240a8c155c9f76f7b9 (diff) | |
| download | backport-iwlwifi-cff3352199fb6e8c9edbecc1b78d8cfc45b38b36.tar.gz | |
[BUGFIX] backport: use lockdep_assert() argument only with lockdep
When CONFIG_LOCKDEP isn't defined, chances are the likely
arguments containing e.g. lockdep_is_held() aren't either.
Make the macro empty in that case.
type=bugfix
fixes=I8ec3ff76d2b09e193cefd309aa404f0f990e794e
ticket=none
Change-Id: Ibe3d50e7a2e3f1f9cd855c643c8afd3b6b98fcda
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99216
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>
(cherry picked from commit 3a60b525633df5fb711235a0c086bee5328e0c57)
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/100363
PerCI-Ready: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
x-iwlwifi-stack-dev: 48683aa64b1048d5e2bb74e60713abadcf3d7318
| -rw-r--r-- | backport-include/linux/lockdep.h | 6 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/backport-include/linux/lockdep.h b/backport-include/linux/lockdep.h index 07ba6ec80c..9a8a7c36e4 100644 --- a/backport-include/linux/lockdep.h +++ b/backport-include/linux/lockdep.h @@ -31,7 +31,11 @@ int lockdep_is_held(const void *); #endif /* lockdep_assert_not_held */ #if LINUX_VERSION_IS_LESS(5,15,0) +#ifdef CONFIG_LOCKDEP #define lockdep_assert(cond) \ do { WARN_ON(debug_locks && !(cond)); } while (0) -#endif +#else +#define lockdep_assert(cond) do {} while (0) +#endif /* CONFIG_LOCKDEP */ +#endif /* LINUX_VERSION_IS_LESS(5,15,0) */ #endif /* __BACKPORT_LINUX_LOCKDEP_H */ @@ -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:12042:24ae9abb" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12043:48683aa6" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" |