diff options
| -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" |