The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 0afda3a888dccf12557b41ef42eee942327d122b
Gitweb:
https://git.kernel.org/tip/0afda3a888dccf12557b41ef42eee942327d122b
Author: Peter Zijlstra <pet...@infradead.org>
AuthorDate: Wed, 06 Jan 2021 15:36:22 +01:00
Committer: Thomas Gleixner <t...@linutronix.de>
CommitterDate: Tue, 12 Jan 2021 21:10:59 +01:00
locking/lockdep: Cure noinstr fail
When the compiler doesn't feel like inlining, it causes a noinstr
fail:
vmlinux.o: warning: objtool: lock_is_held_type()+0xb: call to
lockdep_enabled() leaves .noinstr.text section
Fixes: 4d004099a668 ("lockdep: Fix lockdep recursion")
Reported-by: Randy Dunlap <rdun...@infradead.org>
Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Link: https://lore.kernel.org/r/20210106144017.592595...@infradead.org
---
kernel/locking/lockdep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index c1418b4..02bc5b8 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -79,7 +79,7 @@ module_param(lock_stat, int, 0644);
DEFINE_PER_CPU(unsigned int, lockdep_recursion);
EXPORT_PER_CPU_SYMBOL_GPL(lockdep_recursion);
-static inline bool lockdep_enabled(void)
+static __always_inline bool lockdep_enabled(void)
{
if (!debug_locks)
return false;
