Skip to content

Commit 407b907

Browse files
committed
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: Ingo Molnar <mingo@kernel.org> Acked-by: Peter 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
1 parent 687fac9 commit 407b907

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • arch/x86/include/asm

arch/x86/include/asm/bug.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
#ifdef CONFIG_DEBUG_BUGVERBOSE
4141

42-
#define _BUG_FLAGS(ins, flags, extra) \
42+
#define _BUG_FLAGS(cond_str, ins, flags, extra) \
4343
do { \
4444
asm_inline volatile("1:\t" ins "\n" \
4545
".pushsection __bug_table,\"aw\"\n" \
@@ -57,7 +57,7 @@ do { \
5757

5858
#else /* !CONFIG_DEBUG_BUGVERBOSE */
5959

60-
#define _BUG_FLAGS(ins, flags, extra) \
60+
#define _BUG_FLAGS(cond_str, ins, flags, extra) \
6161
do { \
6262
asm_inline volatile("1:\t" ins "\n" \
6363
".pushsection __bug_table,\"aw\"\n" \
@@ -74,15 +74,15 @@ do { \
7474

7575
#else
7676

77-
#define _BUG_FLAGS(ins, flags, extra) asm volatile(ins)
77+
#define _BUG_FLAGS(cond_str, ins, flags, extra) asm volatile(ins)
7878

7979
#endif /* CONFIG_GENERIC_BUG */
8080

8181
#define HAVE_ARCH_BUG
8282
#define BUG() \
8383
do { \
8484
instrumentation_begin(); \
85-
_BUG_FLAGS(ASM_UD2, 0, ""); \
85+
_BUG_FLAGS("", ASM_UD2, 0, ""); \
8686
__builtin_unreachable(); \
8787
} while (0)
8888

@@ -96,7 +96,7 @@ do { \
9696
do { \
9797
__auto_type __flags = BUGFLAG_WARNING|(flags); \
9898
instrumentation_begin(); \
99-
_BUG_FLAGS(ASM_UD2, __flags, ANNOTATE_REACHABLE(1b)); \
99+
_BUG_FLAGS(cond_str, ASM_UD2, __flags, ANNOTATE_REACHABLE(1b)); \
100100
instrumentation_end(); \
101101
} while (0)
102102

0 commit comments

Comments
 (0)