Commit a093c92d authored Jun 14, 2017 by Alexey Kardashevskiy Committed by Michael Ellerman Jun 16, 2017

powerpc/debug: Add missing warn flag to WARN_ON's non-builtin path



When trapped on WARN_ON(), report_bug() is expected to return
BUG_TRAP_TYPE_WARN so the caller will increment NIP by 4 and continue.
The __builtin_constant_p() path of the PPC's WARN_ON()
calls (indirectly) __WARN_FLAGS() which has BUGFLAG_WARNING set,
however the other branch does not which makes report_bug() report a
bug rather than a warning.

Fixes: f26dee15 ("debug: Avoid setting BUGFLAG_WARNING twice")
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 25642705

arch/powerpc/include/asm/bug.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@
		"1: "PPC_TLNEI" %4,0\n" \
		_EMIT_BUG_ENTRY \
		: : "i" (__FILE__), "i" (__LINE__), \
		"i" (BUGFLAG_TAINT(TAINT_WARN)), \
		"i" (BUGFLAG_WARNING\|BUGFLAG_TAINT(TAINT_WARN)),\
		"i" (sizeof(struct bug_entry)), \
		"r" (__ret_warn_on)); \
		} \