From: Ingo Molnar Date: Thu, 15 May 2025 12:46:38 +0000 (+0200) Subject: bugs/LoongArch: Concatenate 'cond_str' with '__FILE__' in __BUG_ENTRY(), to extend... X-Git-Tag: v6.19-rc1~229^2~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6b894cbfa4b91e2a7eaf5bc0a91cac48c5f4311;p=thirdparty%2Fkernel%2Flinux.git bugs/LoongArch: Concatenate 'cond_str' with '__FILE__' in __BUG_ENTRY(), to extend WARN_ON/BUG_ON output Extend WARN_ON and BUG_ON style output from: WARNING: CPU: 0 PID: 0 at kernel/sched/core.c:8511 sched_init+0x20/0x410 to: WARNING: CPU: 0 PID: 0 at [idx < 0 && ptr] kernel/sched/core.c:8511 sched_init+0x20/0x410 Note that the output will be further reorganized later in this series. [ peterz: backmerge fix from Nathan ] Fixed-by: Nathan Chancellor Signed-off-by: Ingo Molnar Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar # Cleaned up tags section Cc: Huacai Chen Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: WANG Xuerui Cc: linux-arch@vger.kernel.org Link: https://lore.kernel.org/r/20250515124644.2958810-10-mingo@kernel.org Link: https://lore.kernel.org/r/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org --- diff --git a/arch/loongarch/include/asm/bug.h b/arch/loongarch/include/asm/bug.h index 3c377984457d1..d090a5bec5eb3 100644 --- a/arch/loongarch/include/asm/bug.h +++ b/arch/loongarch/include/asm/bug.h @@ -11,7 +11,7 @@ #else #define __BUGVERBOSE_LOCATION(file, line) \ .pushsection .rodata.str, "aMS", @progbits, 1; \ - 10002: .string file; \ + 10002: .ascii file "\0"; \ .popsection; \ \ .long 10002b - .; \ @@ -26,7 +26,7 @@ .pushsection __bug_table, "aw"; \ .align 2; \ 10000: .long 10001f - .; \ - _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ + _BUGVERBOSE_LOCATION(WARN_CONDITION_STR(cond_str) __FILE__, __LINE__) \ .short flags; \ .popsection; \ 10001: