Commit 7dedcee3 authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar

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: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 78cbac65
...@@ -355,17 +355,24 @@ static const struct stacktrace_ops print_trace_ops = { ...@@ -355,17 +355,24 @@ static const struct stacktrace_ops print_trace_ops = {
.address = print_trace_address, .address = print_trace_address,
}; };
void show_trace(struct task_struct *task, struct pt_regs *regs, static void
unsigned long *stack, unsigned long bp) 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"); 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"); 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 static void
_show_stack(struct task_struct *task, struct pt_regs *regs, show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *sp, unsigned long bp) unsigned long *sp, unsigned long bp, char *log_lvl)
{ {
unsigned long *stack; unsigned long *stack;
int i; int i;
...@@ -399,12 +406,12 @@ _show_stack(struct task_struct *task, struct pt_regs *regs, ...@@ -399,12 +406,12 @@ _show_stack(struct task_struct *task, struct pt_regs *regs,
printk(" %016lx", *stack++); printk(" %016lx", *stack++);
touch_nmi_watchdog(); 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) void show_stack(struct task_struct *task, unsigned long *sp)
{ {
_show_stack(task, NULL, sp, 0); show_stack_log_lvl(task, NULL, sp, 0, "");
} }
/* /*
...@@ -454,7 +461,8 @@ void show_registers(struct pt_regs *regs) ...@@ -454,7 +461,8 @@ void show_registers(struct pt_regs *regs)
u8 *ip; u8 *ip;
printk("Stack: "); 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("\n");
printk(KERN_EMERG "Code: "); printk(KERN_EMERG "Code: ");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment