Commit 1c59c2b2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

bugs/powerpc: Pass in 'cond_str' to BUG_ENTRY() 



Pass in the condition string from __WARN_FLAGS(), WARN_ON()
and BUG_ON(), but don't use it yet.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Naveen N Rao <naveen@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: linux-arch@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Link: https://lore.kernel.org/r/20250515124644.2958810-7-mingo@kernel.org
parent 48ede5be

arch/powerpc/include/asm/bug.h

+5 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
	".previous\n"

#endif



#define BUG_ENTRY(insn, flags, ...)			\

#define BUG_ENTRY(cond_str, insn, flags, ...)		\

	__asm__ __volatile__(				\

		"1:	" insn "\n"			\

		_EMIT_BUG_ENTRY				\
@@ -67,12 +67,12 @@ 
 */



#define BUG() do {						\

	BUG_ENTRY("twi 31, 0, 0", 0);				\

	BUG_ENTRY("", "twi 31, 0, 0", 0);			\

	unreachable();						\

} while (0)

#define HAVE_ARCH_BUG



#define __WARN_FLAGS(cond_str, flags) BUG_ENTRY("twi 31, 0, 0", BUGFLAG_WARNING | (flags))

#define __WARN_FLAGS(cond_str, flags) BUG_ENTRY(cond_str, "twi 31, 0, 0", BUGFLAG_WARNING | (flags))



#ifdef CONFIG_PPC64

#define BUG_ON(x) do {						\
@@ -80,7 +80,7 @@ 
		if (x)						\

			BUG();					\

	} else {						\

		BUG_ENTRY(PPC_TLNEI " %4, 0", 0, "r" ((__force long)(x)));	\

		BUG_ENTRY(#x, PPC_TLNEI " %4, 0", 0, "r" ((__force long)(x)));	\

	}							\

} while (0)
@@ -90,7 +90,7 @@ 
		if (__ret_warn_on)				\

			__WARN();				\

	} else {						\

		BUG_ENTRY(PPC_TLNEI " %4, 0",			\

		BUG_ENTRY(#x, PPC_TLNEI " %4, 0",			\

			  BUGFLAG_WARNING | BUGFLAG_TAINT(TAINT_WARN),	\

			  "r" (__ret_warn_on));	\

	}							\