Skip to content

Commit d6b894c

Browse files
committed
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 <nathan@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> # Cleaned up tags section Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Josh Poimboeuf <jpoimboe@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: WANG Xuerui <kernel@xen0n.name> 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
1 parent 66e94df commit d6b894c

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • arch/loongarch/include/asm

arch/loongarch/include/asm/bug.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#else
1212
#define __BUGVERBOSE_LOCATION(file, line) \
1313
.pushsection .rodata.str, "aMS", @progbits, 1; \
14-
10002: .string file; \
14+
10002: .ascii file "\0"; \
1515
.popsection; \
1616
\
1717
.long 10002b - .; \
@@ -26,7 +26,7 @@
2626
.pushsection __bug_table, "aw"; \
2727
.align 2; \
2828
10000: .long 10001f - .; \
29-
_BUGVERBOSE_LOCATION(__FILE__, __LINE__) \
29+
_BUGVERBOSE_LOCATION(WARN_CONDITION_STR(cond_str) __FILE__, __LINE__) \
3030
.short flags; \
3131
.popsection; \
3232
10001:

0 commit comments

Comments
 (0)