In order to keep things easy this drops the mergeable section trick and results in a small increase of the rodata section. Signed-off-by: Heiko Carstens <hca@xxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: linux-arch@xxxxxxxxxxxxxxx Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx> Cc: Alexander Gordeev <agordeev@xxxxxxxxxxxxx> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxxxxx> Cc: Sven Schnelle <svens@xxxxxxxxxxxxx> Cc: linux-s390@xxxxxxxxxxxxxxx Link: https://lore.kernel.org/r/20250520133927.7932C19-hca@xxxxxxxxxxxxx --- arch/s390/include/asm/bug.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h index 30f8785a01f5..837bfbde0c51 100644 --- a/arch/s390/include/asm/bug.h +++ b/arch/s390/include/asm/bug.h @@ -11,16 +11,14 @@ #define __EMIT_BUG(cond_str, x) do { \ asm_inline volatile( \ "0: mc 0,0\n" \ - ".section .rodata.str,\"aMS\",@progbits,1\n" \ - "1: .asciz \""__FILE__"\"\n" \ - ".previous\n" \ ".section __bug_table,\"aw\"\n" \ - "2: .long 0b-.\n" \ - " .long 1b-.\n" \ - " .short %0,%1\n" \ - " .org 2b+%2\n" \ + "1: .long 0b-.\n" \ + " .long %0-.\n" \ + " .short %1,%2\n" \ + " .org 1b+%3\n" \ ".previous\n" \ - : : "i" (__LINE__), \ + : : "i" (WARN_CONDITION_STR(cond_str) __FILE__),\ + "i" (__LINE__), \ "i" (x), \ "i" (sizeof(struct bug_entry))); \ } while (0)
