Commit 96389cf3 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Peter Zijlstra
Browse files

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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250314160810.2373416-8-bigeasy@linutronix.de
parent b70f50be

arch/x86/kernel/dumpstack.c

+2 −7
Original line number Diff line number Diff line
@@ -395,18 +395,13 @@ NOKPROBE_SYMBOL(oops_end); 


static void __die_header(const char *str, struct pt_regs *regs, long err)

{

	const char *pr = "";



	/* Save the regs of the first oops for the executive summary later. */

	if (!die_counter)

		exec_summary_regs = *regs;



	if (IS_ENABLED(CONFIG_PREEMPTION))

		pr = IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT";



	printk(KERN_DEFAULT

	       "Oops: %s: %04lx [#%d]%s%s%s%s%s\n", str, err & 0xffff,

	       ++die_counter, pr,

	       "Oops: %s: %04lx [#%d]%s%s%s%s\n", str, err & 0xffff,

	       ++die_counter,

	       IS_ENABLED(CONFIG_SMP)     ? " SMP"             : "",

	       debug_pagealloc_enabled()  ? " DEBUG_PAGEALLOC" : "",

	       IS_ENABLED(CONFIG_KASAN)   ? " KASAN"           : "",