diff options
author | Alexander van Heukelum <heukelum@sleipnir.lusi.uni-sb.de> | 2008-10-04 17:12:44 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:33:43 -0400 |
commit | ca0a816403c53411bb6b6fb8bf60cef30695b09d (patch) | |
tree | 2a19497527209f362934d9edb8612651ed3a8122 /arch/x86/kernel/dumpstack_64.c | |
parent | 2ac53721f37c79acddaf60f6ff232f56b7abddba (diff) |
dumpstack: x86: use log_lvl and unify trace formatting
- x86: Write log_lvl strings if available
- start raw stack dumps on new line
- i386: Remove extra indentation for raw stack dumps
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/dumpstack_64.c')
-rw-r--r-- | arch/x86/kernel/dumpstack_64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 521c833cdc3b..7fd32944ceac 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c | |||
@@ -284,7 +284,7 @@ static void | |||
284 | show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, | 284 | show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, |
285 | unsigned long *stack, unsigned long bp, char *log_lvl) | 285 | unsigned long *stack, unsigned long bp, char *log_lvl) |
286 | { | 286 | { |
287 | printk("Call Trace:\n"); | 287 | printk("%sCall Trace:\n", log_lvl); |
288 | dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl); | 288 | dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl); |
289 | } | 289 | } |
290 | 290 | ||
@@ -330,7 +330,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | |||
330 | break; | 330 | break; |
331 | } | 331 | } |
332 | if (i && ((i % 4) == 0)) | 332 | if (i && ((i % 4) == 0)) |
333 | printk("\n"); | 333 | printk("\n%s", log_lvl); |
334 | printk(" %016lx", *stack++); | 334 | printk(" %016lx", *stack++); |
335 | touch_nmi_watchdog(); | 335 | touch_nmi_watchdog(); |
336 | } | 336 | } |
@@ -388,9 +388,9 @@ void show_registers(struct pt_regs *regs) | |||
388 | unsigned char c; | 388 | unsigned char c; |
389 | u8 *ip; | 389 | u8 *ip; |
390 | 390 | ||
391 | printk("Stack: "); | 391 | printk(KERN_EMERG "Stack:\n"); |
392 | show_stack_log_lvl(NULL, regs, (unsigned long *)sp, | 392 | show_stack_log_lvl(NULL, regs, (unsigned long *)sp, |
393 | regs->bp, ""); | 393 | regs->bp, KERN_EMERG); |
394 | 394 | ||
395 | printk(KERN_EMERG "Code: "); | 395 | printk(KERN_EMERG "Code: "); |
396 | 396 | ||