diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:19:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:19:50 -0400 |
commit | 446d27338d3b422dd3dfe496d0f362230994d059 (patch) | |
tree | 3452a8c7c487675020b2a2137635bc7dfede57fe /arch/x86/kernel/traps_64.c | |
parent | accf0fa697eeb5ff4c2360edc4da5b10abac0b7b (diff) | |
parent | 0a488a53d7ca46ac638c30079072c57e50cfcc7b (diff) |
Merge branch 'x86/cpu' into x86/core
Diffstat (limited to 'arch/x86/kernel/traps_64.c')
-rw-r--r-- | arch/x86/kernel/traps_64.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index 38eb76156a47..b42068fb7b76 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -339,9 +339,8 @@ static void | |||
339 | show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, | 339 | show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, |
340 | unsigned long *stack, unsigned long bp, char *log_lvl) | 340 | unsigned long *stack, unsigned long bp, char *log_lvl) |
341 | { | 341 | { |
342 | printk("\nCall Trace:\n"); | 342 | printk("Call Trace:\n"); |
343 | dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl); | 343 | dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl); |
344 | printk("\n"); | ||
345 | } | 344 | } |
346 | 345 | ||
347 | void show_trace(struct task_struct *task, struct pt_regs *regs, | 346 | void show_trace(struct task_struct *task, struct pt_regs *regs, |
@@ -386,6 +385,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | |||
386 | printk(" %016lx", *stack++); | 385 | printk(" %016lx", *stack++); |
387 | touch_nmi_watchdog(); | 386 | touch_nmi_watchdog(); |
388 | } | 387 | } |
388 | printk("\n"); | ||
389 | show_trace_log_lvl(task, regs, sp, bp, log_lvl); | 389 | show_trace_log_lvl(task, regs, sp, bp, log_lvl); |
390 | } | 390 | } |
391 | 391 | ||
@@ -443,7 +443,6 @@ void show_registers(struct pt_regs *regs) | |||
443 | printk("Stack: "); | 443 | printk("Stack: "); |
444 | show_stack_log_lvl(NULL, regs, (unsigned long *)sp, | 444 | show_stack_log_lvl(NULL, regs, (unsigned long *)sp, |
445 | regs->bp, ""); | 445 | regs->bp, ""); |
446 | printk("\n"); | ||
447 | 446 | ||
448 | printk(KERN_EMERG "Code: "); | 447 | printk(KERN_EMERG "Code: "); |
449 | 448 | ||