diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
| commit | 3b38f317e529d8396377dafc7d95a1451a151df5 (patch) | |
| tree | 65e80799417c456bdd907b7d80182732be02e5f4 /arch/i386/kernel/traps.c | |
| parent | 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 (diff) | |
| parent | 353b28bafd1b962359a866ff263a7fad833d29a1 (diff) | |
Merge branch 'from-linus' 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 2d22f5761b1d..0e498369f35e 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; |