]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
xtensa: Rely on generic printing of preemption model
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Fri, 14 Mar 2025 16:08:09 +0000 (17:08 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Mon, 17 Mar 2025 10:23:40 +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: Max Filippov <jcmvbkbc@gmail.com>
Link: https://lore.kernel.org/r/20250314160810.2373416-9-bigeasy@linutronix.de
arch/xtensa/kernel/traps.c

index 38092d21acf8e4b285e649cbea6b3bc6920bfa7c..44c07c4e0833a74b5231ae778ea4d1c516b717b2 100644 (file)
@@ -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);