]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: Rely on generic printing of preemption model
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Fri, 14 Mar 2025 16:08:05 +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>
Acked-by: Will Deacon <will@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20250314160810.2373416-5-bigeasy@linutronix.de
arch/arm64/kernel/traps.c

index 4e26bd356a482b636755a6c8cb86d59809ff8f38..529cff825531c8ac33e38907919b715c3bcbd8a5 100644 (file)
@@ -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 */