Skip to content

Commit 96389cf

Browse files
Sebastian Andrzej SiewiorPeter Zijlstra
authored andcommitted
x86: Rely on generic printing of preemption model
After __die_header(), __die_body() is always invoked. There we have show_regs() -> show_regs_print_info() which prints the current preemption model. Remove it from the initial line. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent b70f50b commit 96389cf

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

arch/x86/kernel/dumpstack.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -395,18 +395,13 @@ NOKPROBE_SYMBOL(oops_end);
395395

396396
static void __die_header(const char *str, struct pt_regs *regs, long err)
397397
{
398-
const char *pr = "";
399-
400398
/* Save the regs of the first oops for the executive summary later. */
401399
if (!die_counter)
402400
exec_summary_regs = *regs;
403401

404-
if (IS_ENABLED(CONFIG_PREEMPTION))
405-
pr = IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT";
406-
407402
printk(KERN_DEFAULT
408-
"Oops: %s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff,
409-
++die_counter, pr,
403+
"Oops: %s: %04lx [#%d]%s%s%s%s\n", str, err & 0xffff,
404+
++die_counter,
410405
IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
411406
debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
412407
IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "",

0 commit comments

Comments
 (0)