Skip to content

Commit 6966cd4

Browse files
Sebastian Andrzej SiewiorPeter Zijlstra
authored andcommitted
xtensa: 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: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Acked-by: Max Filippov <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 96389cf commit 6966cd4

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

arch/xtensa/kernel/traps.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -629,15 +629,11 @@ DEFINE_SPINLOCK(die_lock);
629629
void __noreturn die(const char * str, struct pt_regs * regs, long err)
630630
{
631631
static int die_counter;
632-
const char *pr = "";
633-
634-
if (IS_ENABLED(CONFIG_PREEMPTION))
635-
pr = IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT";
636632

637633
console_verbose();
638634
spin_lock_irq(&die_lock);
639635

640-
pr_info("%s: sig: %ld [#%d]%s\n", str, err, ++die_counter, pr);
636+
pr_info("%s: sig: %ld [#%d]\n", str, err, ++die_counter);
641637
show_regs(regs);
642638
if (!user_mode(regs))
643639
show_stack(NULL, (unsigned long *)regs->areg[1], KERN_INFO);

0 commit comments

Comments
 (0)