Commit 407b9076 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

bugs/x86: Extend _BUG_FLAGS() with the 'cond_str' parameter 



Just pass down the parameter, don't do anything with it yet.

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-5-mingo@kernel.org
parent 687fac9d

arch/x86/include/asm/bug.h

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#ifdef CONFIG_DEBUG_BUGVERBOSE



#define _BUG_FLAGS(ins, flags, extra)					\

#define _BUG_FLAGS(cond_str, ins, flags, extra)				\

do {									\

	asm_inline volatile("1:\t" ins "\n"				\

		     ".pushsection __bug_table,\"aw\"\n"		\
@@ -57,7 +57,7 @@ do { \ 


#else /* !CONFIG_DEBUG_BUGVERBOSE */



#define _BUG_FLAGS(ins, flags, extra)					\

#define _BUG_FLAGS(cond_str, ins, flags, extra)				\

do {									\

	asm_inline volatile("1:\t" ins "\n"				\

		     ".pushsection __bug_table,\"aw\"\n"		\
@@ -74,7 +74,7 @@ do { \ 


#else



#define _BUG_FLAGS(ins, flags, extra)  asm volatile(ins)

#define _BUG_FLAGS(cond_str, ins, flags, extra)  asm volatile(ins)



#endif /* CONFIG_GENERIC_BUG */
@@ -82,7 +82,7 @@ do { \ 
#define BUG()							\

do {								\

	instrumentation_begin();				\

	_BUG_FLAGS(ASM_UD2, 0, "");				\

	_BUG_FLAGS("", ASM_UD2, 0, "");				\

	__builtin_unreachable();				\

} while (0)
@@ -96,7 +96,7 @@ do { \ 
do {								\

	__auto_type __flags = BUGFLAG_WARNING|(flags);		\

	instrumentation_begin();				\

	_BUG_FLAGS(ASM_UD2, __flags, ANNOTATE_REACHABLE(1b));	\

	_BUG_FLAGS(cond_str, ASM_UD2, __flags, ANNOTATE_REACHABLE(1b)); \

	instrumentation_end();					\

} while (0)