| Message ID | 20220311194800.452-1-ynezz@true.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | headers: fix lockdep_assert_not_held() | expand |
On 3/11/22 20:48, Petr Štetiar wrote: > 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 > Fixes: af58b27b1b1a ("headers: Add lockdep_assert_not_held()") > Reported-by: Oskari Rauta <oskari.rauta@gmail.com> > Signed-off-by: Petr Štetiar <ynezz@true.cz> Thank you for your patch, I applied it to master. Hauke -- To unsubscribe from this list: send the line "unsubscribe backports" in
diff --git a/backport/backport-include/linux/lockdep.h b/backport/backport-include/linux/lockdep.h index ed5ea67894e4..842e24b7ff8f 100644 --- a/backport/backport-include/linux/lockdep.h +++ b/backport/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); \
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 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/backport-include/linux/lockdep.h | 3 +++ 1 file changed, 3 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe backports" in