Skip to content

Commit 7ce0f69

Browse files
committed
bugs/s390: Pass in 'cond_str' to __EMIT_BUG()
Pass in the condition string from __WARN_FLAGS(), but do not concatenate it with __FILE__, because it results in s390 assembler build errors that are beyond my s390-asm-fu. Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Christian Borntraeger <borntraeger@linux.ibm.com> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: linux-s390@vger.kernel.org Cc: <linux-arch@vger.kernel.org> Link: https://lore.kernel.org/r/20250515124644.2958810-11-mingo@kernel.org
1 parent d6b894c commit 7ce0f69

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

  • arch/s390/include/asm

arch/s390/include/asm/bug.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#ifdef CONFIG_DEBUG_BUGVERBOSE
1010

11-
#define __EMIT_BUG(x) do { \
11+
#define __EMIT_BUG(cond_str, x) do { \
1212
asm_inline volatile( \
1313
"0: mc 0,0\n" \
1414
".section .rodata.str,\"aMS\",@progbits,1\n" \
@@ -27,7 +27,7 @@
2727

2828
#else /* CONFIG_DEBUG_BUGVERBOSE */
2929

30-
#define __EMIT_BUG(x) do { \
30+
#define __EMIT_BUG(cond_str, x) do { \
3131
asm_inline volatile( \
3232
"0: mc 0,0\n" \
3333
".section __bug_table,\"aw\"\n" \
@@ -42,12 +42,12 @@
4242
#endif /* CONFIG_DEBUG_BUGVERBOSE */
4343

4444
#define BUG() do { \
45-
__EMIT_BUG(0); \
45+
__EMIT_BUG("", 0); \
4646
unreachable(); \
4747
} while (0)
4848

4949
#define __WARN_FLAGS(cond_str, flags) do { \
50-
__EMIT_BUG(BUGFLAG_WARNING|(flags)); \
50+
__EMIT_BUG(cond_str, BUGFLAG_WARNING|(flags)); \
5151
} while (0)
5252

5353
#define WARN_ON(x) ({ \

0 commit comments

Comments
 (0)