]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm: Rely on generic printing of preemption model
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Fri, 14 Mar 2025 16:08:04 +0000 (17:08 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Mon, 17 Mar 2025 10:23:39 +0000 (11:23 +0100)
__die() invokes later __show_regs() -> show_regs_print_info() which
prints the current preemption model.
Remove it from the initial line.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/20250314160810.2373416-4-bigeasy@linutronix.de
arch/arm/kernel/traps.c

index 6ea645939573fb65ed36f5435a9c94e98828f45b..afbd2ebe5c39dca42e5cfac1d46213f0d5b63d5c 100644 (file)
@@ -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,8 +275,8 @@ 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",
-                str, err, ++die_counter);
+       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 */
        ret = notify_die(DIE_OOPS, str, regs, err, tsk->thread.trap_no, SIGSEGV);