Skip to content

Commit b70f50b

Browse files
Sebastian Andrzej SiewiorPeter Zijlstra
authored andcommitted
s390: 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: Heiko Carstens <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 732ed14 commit b70f50b

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

arch/s390/kernel/dumpstack.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,8 @@ void __noreturn die(struct pt_regs *regs, const char *str)
198198
console_verbose();
199199
spin_lock_irq(&die_lock);
200200
bust_spinlocks(1);
201-
printk("%s: %04x ilc:%d [#%d] ", str, regs->int_code & 0xffff,
201+
printk("%s: %04x ilc:%d [#%d]", str, regs->int_code & 0xffff,
202202
regs->int_code >> 17, ++die_counter);
203-
#ifdef CONFIG_PREEMPT
204-
pr_cont("PREEMPT ");
205-
#elif defined(CONFIG_PREEMPT_RT)
206-
pr_cont("PREEMPT_RT ");
207-
#endif
208203
pr_cont("SMP ");
209204
if (debug_pagealloc_enabled())
210205
pr_cont("DEBUG_PAGEALLOC");

0 commit comments

Comments
 (0)