diff options
| author | Petr Štetiar <ynezz@true.cz> | 2022-03-11 20:56:02 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-03-15 08:33:45 +0100 |
| commit | 9cdd15d8a5d2d504e4d1ec8a118e9c3e564de92e (patch) | |
| tree | eca097f1f63bf212cb3a8f34f2c781672041ebe5 /package | |
| parent | 41be1a2de2f84f532a7eb1c11ece99811ca47ba5 (diff) | |
| download | upstream-9cdd15d8a5d2d504e4d1ec8a118e9c3e564de92e.tar.gz upstream-9cdd15d8a5d2d504e4d1ec8a118e9c3e564de92e.tar.bz2 upstream-9cdd15d8a5d2d504e4d1ec8a118e9c3e564de92e.zip | |
mac80211: headers: fix lockdep_assert_not_held()
LOCK_STATE_HELD define was omitted during backport of
lockdep_assert_not_held() which leads to build failures of kernels with
CONFIG_LOCKDEP=y:
backports-5.15.8-1/backport-include/linux/lockdep.h:16:47: error: 'LOCK_STATE_HELD' undeclared (first use in this function)
Fix it by adding missing LOCK_STATE_HELD define.
References: PR#9373
Reported-by: Oskari Rauta <oskari.rauta@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/mac80211/Makefile | 2 | ||||
| -rw-r--r-- | package/kernel/mac80211/patches/build/070-headers-fix-lockdep_assert_not_held.patch | 39 |
2 files changed, 40 insertions, 1 deletions
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 2f9fd11f10..715e851a13 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 PKG_VERSION:=5.15.8-1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.15.8/ PKG_HASH:=9f71b659c034f19d156532ec780fcb606cee3c4ccc42e2f8ef18dd3e9f1b6820 diff --git a/package/kernel/mac80211/patches/build/070-headers-fix-lockdep_assert_not_held.patch b/package/kernel/mac80211/patches/build/070-headers-fix-lockdep_assert_not_held.patch new file mode 100644 index 0000000000..d946efa174 --- /dev/null +++ b/package/kernel/mac80211/patches/build/070-headers-fix-lockdep_assert_not_held.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz> +Date: Fri, 11 Mar 2022 18:21:04 +0100 +Subject: [PATCH] headers: fix lockdep_assert_not_held() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +LOCK_STATE_HELD define was omitted during backport of +lockdep_assert_not_held() which leads to build failures of kernels with +CONFIG_LOCKDEP=y: + + backports-5.15.8-1/backport-include/linux/lockdep.h:16:47: error: 'LOCK_STATE_HELD' undeclared (first use in this function) + +Fix it by adding missing LOCK_STATE_HELD define. + +References: https://github.com/openwrt/openwrt/pull/9373 +References: https://lore.kernel.org/backports/20220311194800.452-1-ynezz@true.cz/T/#u +Fixes: af58b27b1b1a ("headers: Add lockdep_assert_not_held()") +Reported-by: Oskari Rauta <oskari.rauta@gmail.com> +Signed-off-by: Petr Štetiar <ynezz@true.cz> +--- + backport-include/linux/lockdep.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/backport-include/linux/lockdep.h b/backport-include/linux/lockdep.h +index ed5ea67894e4..842e24b7ff8f 100644 +--- a/backport-include/linux/lockdep.h ++++ b/backport-include/linux/lockdep.h +@@ -11,6 +11,9 @@ struct lockdep_map { }; + + #ifndef lockdep_assert_not_held + #ifdef CONFIG_LOCKDEP ++#ifndef LOCK_STATE_HELD ++#define LOCK_STATE_HELD 1 ++#endif /* LOCK_STATE_HELD */ + #define lockdep_assert_not_held(l) do { \ + WARN_ON(debug_locks && \ + lockdep_is_held(l) == LOCK_STATE_HELD); \ |