diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 04:03:15 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-14 04:03:15 +0300 |
| commit | 7e3591453de3ce12e0d6d6d4e80ff3bb659e4d70 (patch) | |
| tree | ea08c8ad8288c2b3133e276e95dad0f75a0edc72 /arch | |
| parent | 9d8e0d52a2a4c4ab87da01cb17f15f1ec6cee826 (diff) | |
| parent | f9f62a877da1e6f6e9d58bd779c1c77052eb04ab (diff) | |
| download | linux-7e3591453de3ce12e0d6d6d4e80ff3bb659e4d70.tar.xz | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 44a91ef5a23b..a7d562697e50 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -405,8 +405,8 @@ static void __die_header(const char *str, struct pt_regs *regs, long err) pr = IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT"; printk(KERN_DEFAULT - "%s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff, ++die_counter, - pr, + "Oops: %s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff, + ++die_counter, pr, IS_ENABLED(CONFIG_SMP) ? " SMP" : "", debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "", IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "", |