Skip to content

Commit

Permalink
lockdep: Noinstr annotate warn_bogus_irq_restore()
Browse files Browse the repository at this point in the history
  vmlinux.o: warning: objtool: lock_is_held_type()+0x107: call to warn_bogus_irq_restore() leaves .noinstr.text section

As per the general rule that WARNs are allowed to violate noinstr to
get out, annotate it away.

Fixes: 997acaf ("lockdep: report broken irq restoration")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Link: https://lkml.kernel.org/r/YCKyYg53mMp4E7YI@hirez.programming.kicks-ass.net
  • Loading branch information
Peter Zijlstra committed Feb 10, 2021
1 parent 7f82e63 commit c8cc7e8
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion kernel/locking/irqflag-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
#include <linux/export.h>
#include <linux/irqflags.h>

void warn_bogus_irq_restore(void)
noinstr void warn_bogus_irq_restore(void)
{
instrumentation_begin();
WARN_ONCE(1, "raw_local_irq_restore() called with IRQs enabled\n");
instrumentation_end();
}
EXPORT_SYMBOL(warn_bogus_irq_restore);

0 comments on commit c8cc7e8

Please sign in to comment.