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

arm: 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>
Reviewed-by: default avatar"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/20250314160810.2373416-4-bigeasy@linutronix.de
parent d167706f

arch/arm/kernel/traps.c

+2 −9
Original line number Diff line number Diff line
@@ -258,13 +258,6 @@ void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl) 
	barrier();

}



#ifdef CONFIG_PREEMPT

#define S_PREEMPT " PREEMPT"

#elif defined(CONFIG_PREEMPT_RT)

#define S_PREEMPT " PREEMPT_RT"

#else

#define S_PREEMPT ""

#endif

#ifdef CONFIG_SMP

#define S_SMP " SMP"

#else
@@ -282,7 +275,7 @@ static int __die(const char *str, int err, struct pt_regs *regs) 
	static int die_counter;

	int ret;



	pr_emerg("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP S_ISA "\n",

	pr_emerg("Internal error: %s: %x [#%d]" S_SMP S_ISA "\n",

		 str, err, ++die_counter);



	/* trap and error numbers are mostly meaningless on ARM */