diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
commit | 26e27cd424554202d36f38ee35421143788da127 (patch) | |
tree | 04d068c76af5b636c061173465faa574d4b5e7b0 /arch/i386/kernel/traps.c | |
parent | b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c (diff) | |
parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
download | kernel-crypto-26e27cd424554202d36f38ee35421143788da127.tar.gz kernel-crypto-26e27cd424554202d36f38ee35421143788da127.tar.xz kernel-crypto-26e27cd424554202d36f38ee35421143788da127.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r-- | arch/i386/kernel/traps.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 2d22f5761b1..0e498369f35 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c @@ -130,9 +130,8 @@ static inline int print_addr_and_symbol(unsigned long addr, char *log_lvl, print_symbol("%s", addr); printed = (printed + 1) % CONFIG_STACK_BACKTRACE_COLS; - if (printed) - printk(" "); + printk(" "); else printk("\n"); @@ -212,7 +211,6 @@ static void show_stack_log_lvl(struct task_struct *task, unsigned long *esp, } stack = esp; - printk(log_lvl); for(i = 0; i < kstack_depth_to_print; i++) { if (kstack_end(stack)) break; |