Commit 0afda3a8 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

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: 4d004099 ("lockdep: Fix lockdep recursion")
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210106144017.592595176@infradead.org
parent a1d5c98a

kernel/locking/lockdep.c

+1 −1
Original line number Diff line number Diff line
@@ -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;