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

arm64: 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 avatarWill Deacon <will@kernel.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20250314160810.2373416-5-bigeasy@linutronix.de
parent 03288138

arch/arm64/kernel/traps.c

+1 −9
Original line number Diff line number Diff line
@@ -172,14 +172,6 @@ static void dump_kernel_instr(const char *lvl, struct pt_regs *regs) 
	printk("%sCode: %s\n", lvl, str);

}



#ifdef CONFIG_PREEMPT

#define S_PREEMPT " PREEMPT"

#elif defined(CONFIG_PREEMPT_RT)

#define S_PREEMPT " PREEMPT_RT"

#else

#define S_PREEMPT ""

#endif



#define S_SMP " SMP"



static int __die(const char *str, long err, struct pt_regs *regs)
@@ -187,7 +179,7 @@ static int __die(const char *str, long err, struct pt_regs *regs) 
	static int die_counter;

	int ret;



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

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

		 str, err, ++die_counter);



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