x86: traps_xx: modify x86_64 to use _log_lvl variants
PATCH 2/2 x86: traps_xx: modify x86_64 to use _log_lvl variants
i386 has show_trace_log_lvl and show_stack_log_lvl, allowing traces to be emitted with log-level annotations. This patch introduces them to x86_64, but log_lvl is only ever set to an empty string. Output of traces is unchanged.
i386-chunk is whitespace-only.
Signed-off-by Alexander van Heukelum <[email protected]>
--- arch/x86/kernel/traps_32.c | 2 +- arch/x86/kernel/traps_64.c | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-)
arch/x86/kernel/traps_32.c +1 -1
@@ -256,7 +256,7 @@ static const struct stacktrace_ops print_trace_ops = {static void show_trace_log_lvl (struct task_struct *task,struct pt_regs *regs, -unsigned long *stack,unsigned long bp,char *log_lvl) +unsigned long *stack,unsigned long bp,char *log_lvl) {dump_trace (task, regs, stack, bp, &print_trace_ops, log_lvl);printk ("%s =======================\n" , log_lvl);
arch/x86/kernel/traps_64.c +16 -8
@@ -378,17 +378,24 @@ static const struct stacktrace_ops print_trace_ops = { .address = print_trace_address, }; -void show_trace (struct task_struct *task,struct pt_regs *regs, -unsigned long *stack,unsigned long bp) +static void +show_trace_log_lvl (struct task_struct *task,struct pt_regs *regs, +unsigned long *stack,unsigned long bp,char *log_lvl) {printk ("\nCall Trace:\n" ); -dump_trace (task, regs, stack, bp, &print_trace_ops,NULL ); +dump_trace (task, regs, stack, bp, &print_trace_ops, log_lvl);printk ("\n" ); } +void show_trace (struct task_struct *task,struct pt_regs *regs, +unsigned long *stack,unsigned long bp) +{ +show_trace_log_lvl (task, regs, stack, bp,"" ); +} +static void -_show_stack (struct task_struct *task,struct pt_regs *regs, -unsigned long *sp,unsigned long bp) +show_stack_log_lvl (struct task_struct *task,struct pt_regs *regs, +unsigned long *sp,unsigned long bp,char *log_lvl) {unsigned long *stack;int i;
@@ -422,12 +429,12 @@ _show_stack(struct task_struct *task, struct pt_regs *regs,printk (" %016lx" , *stack++);touch_nmi_watchdog (); } -show_trace (task, regs, sp, bp); +show_trace_log_lvl (task, regs, sp, bp, log_lvl); }void show_stack (struct task_struct *task,unsigned long *sp) { -_show_stack (task,NULL , sp,0 ); +show_stack_log_lvl (task,NULL , sp,0 ,"" ); }/*
@@ -477,7 +484,8 @@ void show_registers(struct pt_regs *regs)u8 *ip;printk ("Stack: " ); -_show_stack (NULL , regs, (unsigned long *)sp, regs->bp); +show_stack_log_lvl (NULL , regs, (unsigned long *)sp, + regs->bp,"" );printk ("\n" );printk (KERN_EMERG "Code: " );
Signature · 1 line
1.5.4.3
Ingo Molnar
AppliedQuoted 6 lines · Alexander van Heukelum
i386 has
show_trace_log_lvlandshow_stack_log_lvl, allowing traces to be emitted with log-level annotations. This patch introduces them tox86_64, butlog_lvlis only ever set to an empty string. Output of traces is unchanged.i386-chunk is whitespace-only.
applied to tip/x86/core, thanks Alexander.
Ingo