diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-05-01 19:51:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-05-01 19:51:14 +0200 |
| commit | ec7c3198d134afe1f3d09c06f23e3b6092cd74c9 (patch) | |
| tree | bc9283a2aa294aee9dc7e9537e25a23c10d49716 | |
| parent | c73ce0b8e2e8aeaa61d4d23d250cfcf00597451b (diff) | |
| parent | f9f62a877da1e6f6e9d58bd779c1c77052eb04ab (diff) | |
| download | tip-ec7c3198d134afe1f3d09c06f23e3b6092cd74c9.tar.gz | |
Merge branch into tip/master: 'x86/bugs'
Notice: this object is not reachable from any branch.
# New commits in x86/bugs:
f9f62a877da1 ("x86/dumpstack: Use uniform "Oops: " prefix for die() messages")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Notice: this object is not reachable from any branch.
| -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 44a91ef5a23b8..a7d562697e50e 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" : "", |