path: root/lib
diff options
authorPeter Zijlstra <>2021-06-21 13:12:38 +0200
committerIngo Molnar <>2021-06-22 13:56:43 +0200
commit49faa77759b211fff344898edc23bb780707fff5 (patch)
tree9f36b8c797c3f312f08e12634ec2cdbafb6f0a95 /lib
parent1f008d46f1243899d27fd034ab5c41985bd16cee (diff)
locking/lockdep: Improve noinstr vs errors
Better handle the failure paths. vmlinux.o: warning: objtool: debug_locks_off()+0x23: call to console_verbose() leaves .noinstr.text section vmlinux.o: warning: objtool: debug_locks_off()+0x19: call to __kasan_check_write() leaves .noinstr.text section debug_locks_off+0x19/0x40: instrument_atomic_write at include/linux/instrumented.h:86 (inlined by) __debug_locks_off at include/linux/debug_locks.h:17 (inlined by) debug_locks_off at lib/debug_locks.c:41 Fixes: 6eebad1ad303 ("lockdep: __always_inline more for noinstr") Signed-off-by: Peter Zijlstra (Intel) <> Signed-off-by: Ingo Molnar <> Link:
Diffstat (limited to 'lib')
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/debug_locks.c b/lib/debug_locks.c
index 06d3135bd184..a75ee30b77cb 100644
--- a/lib/debug_locks.c
+++ b/lib/debug_locks.c
@@ -36,7 +36,7 @@ EXPORT_SYMBOL_GPL(debug_locks_silent);
* Generic 'turn off all lock debugging' function:
-noinstr int debug_locks_off(void)
+int debug_locks_off(void)
if (debug_locks && __debug_locks_off()) {
if (!debug_locks_silent) {