Skip to content

Commit 7e35914

Browse files
committed
Merge tag 'x86-bugs-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 oops message cleanup from Ingo Molnar: - Use uniform "Oops: " prefix for die() messages * tag 'x86-bugs-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/dumpstack: Use uniform "Oops: " prefix for die() messages
2 parents 9d8e0d5 + f9f62a8 commit 7e35914

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/kernel/dumpstack.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ static void __die_header(const char *str, struct pt_regs *regs, long err)
405405
pr = IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT";
406406

407407
printk(KERN_DEFAULT
408-
"%s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff, ++die_counter,
409-
pr,
408+
"Oops: %s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff,
409+
++die_counter, pr,
410410
IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
411411
debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
412412
IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "",

0 commit comments

Comments
 (0)