Skip to content

Commit 4769437

Browse files
Sebastian Andrzej SiewiorPeter Zijlstra
authored andcommitted
arm64: 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: Will Deacon <[email protected]> Acked-by: Catalin Marinas <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 0328813 commit 4769437

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

arch/arm64/kernel/traps.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,22 +172,14 @@ static void dump_kernel_instr(const char *lvl, struct pt_regs *regs)
172172
printk("%sCode: %s\n", lvl, str);
173173
}
174174

175-
#ifdef CONFIG_PREEMPT
176-
#define S_PREEMPT " PREEMPT"
177-
#elif defined(CONFIG_PREEMPT_RT)
178-
#define S_PREEMPT " PREEMPT_RT"
179-
#else
180-
#define S_PREEMPT ""
181-
#endif
182-
183175
#define S_SMP " SMP"
184176

185177
static int __die(const char *str, long err, struct pt_regs *regs)
186178
{
187179
static int die_counter;
188180
int ret;
189181

190-
pr_emerg("Internal error: %s: %016lx [#%d]" S_PREEMPT S_SMP "\n",
182+
pr_emerg("Internal error: %s: %016lx [#%d] " S_SMP "\n",
191183
str, err, ++die_counter);
192184

193185
/* trap and error numbers are mostly meaningless on ARM */

0 commit comments

Comments
 (0)