Commit 6966cd46 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Peter Zijlstra
Browse files

xtensa: Rely on generic printing of preemption model 



die() invokes later 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>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Link: https://lore.kernel.org/r/20250314160810.2373416-9-bigeasy@linutronix.de
parent 96389cf3

arch/xtensa/kernel/traps.c

+1 −5
Original line number Diff line number Diff line
@@ -629,15 +629,11 @@ DEFINE_SPINLOCK(die_lock); 
void __noreturn die(const char * str, struct pt_regs * regs, long err)

{

	static int die_counter;

	const char *pr = "";



	if (IS_ENABLED(CONFIG_PREEMPTION))

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



	console_verbose();

	spin_lock_irq(&die_lock);



	pr_info("%s: sig: %ld [#%d]%s\n", str, err, ++die_counter, pr);

	pr_info("%s: sig: %ld [#%d]\n", str, err, ++die_counter);

	show_regs(regs);

	if (!user_mode(regs))

		show_stack(NULL, (unsigned long *)regs->areg[1], KERN_INFO);