From: Chuck Ebbert <76306.1226@compuserve.com> Always print stack size in oops messages. By having this line in every message, ugly newline logic can be removed as well. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton --- arch/i386/kernel/traps.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff -puN arch/i386/kernel/traps.c~i386-print-stack-size-in-oops-messages arch/i386/kernel/traps.c --- a/arch/i386/kernel/traps.c~i386-print-stack-size-in-oops-messages +++ a/arch/i386/kernel/traps.c @@ -457,34 +457,26 @@ void die(const char * str, struct pt_reg local_save_flags(flags); if (++die.lock_owner_depth < 3) { - int nl = 0; unsigned long esp; unsigned short ss; handle_BUG(regs); - printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter); + printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, + ++die_counter); + printk(KERN_EMERG "%dK_STACKS ", THREAD_SIZE / 1024); #ifdef CONFIG_PREEMPT - printk(KERN_EMERG "PREEMPT "); - nl = 1; + printk("PREEMPT "); #endif #ifdef CONFIG_SMP - if (!nl) - printk(KERN_EMERG); printk("SMP "); - nl = 1; #endif #ifdef CONFIG_DEBUG_PAGEALLOC - if (!nl) - printk(KERN_EMERG); printk("DEBUG_PAGEALLOC"); - nl = 1; #endif - if (nl) - printk("\n"); + printk("\n"); sysfs_printk_last_file(); if (notify_die(DIE_OOPS, str, regs, err, - current->thread.trap_no, SIGSEGV) != - NOTIFY_STOP) { + current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) { show_registers(regs); /* Executive summary in case the oops scrolled away */ esp = (unsigned long) (®s->esp); _