From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 6 Jan 2021 14:36:22 +0000 (+0100)
Subject: locking/lockdep: Cure noinstr fail
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0afda3a888dccf12557b41ef42eee942327d122b;p=linux.git

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 <rdunlap@infradead.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210106144017.592595176@infradead.org
---

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index c1418b47f625a..02bc5b8f1eb27 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;