Commit aec58b48 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

bugs/core: Extend __WARN_FLAGS() with the 'cond_str' parameter 



Push the new parameter down into every architecture that defines __WARN_FLAGS():

  arm64
  loongarch
  parisc
  powerpc
  riscv
  s390
  sh
  x86

Don't pass anything substantial down yet, just propagate the
new parameter with empty strings, without generating it or
using it.

( The string is never NULL, so it can be concatenated at the
  preprocessor level. )

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Link: https://lore.kernel.org/r/20250515124644.2958810-2-mingo@kernel.org
parent 19272b37

arch/arm64/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
	unreachable();					\

} while (0)



#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))

#define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))



#define HAVE_ARCH_BUG

arch/loongarch/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
	asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags))		\

			     extra);



#define __WARN_FLAGS(flags)					\

#define __WARN_FLAGS(cond_str, flags)				\

do {								\

	instrumentation_begin();				\

	__BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE(10001b));\

arch/parisc/include/asm/bug.h

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#endif



#ifdef CONFIG_DEBUG_BUGVERBOSE

#define __WARN_FLAGS(flags)						\

#define __WARN_FLAGS(cond_str, flags)					\

	do {								\

		asm volatile("\n"					\

			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
@@ -66,7 +66,7 @@ 
			     "i" (sizeof(struct bug_entry)) );		\

	} while(0)

#else

#define __WARN_FLAGS(flags)						\

#define __WARN_FLAGS(cond_str, flags)					\

	do {								\

		asm volatile("\n"					\

			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\

arch/powerpc/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
} while (0)

#define HAVE_ARCH_BUG



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

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



#ifdef CONFIG_PPC64

#define BUG_ON(x) do {						\

arch/riscv/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ do { \ 
	unreachable();						\

} while (0)



#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))

#define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))



#define HAVE_ARCH_BUG