+ i386-print-stack-size-in-oops-messages.patch added to -mm tree

[akpm@xxxxxxxx]

The patch titled

     i386: print stack size in oops messages

has been added to the -mm tree.  Its filename is

     i386-print-stack-size-in-oops-messages.patch

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: i386: print stack size in oops messages
From: Chuck Ebbert <76306.1226@xxxxxxxxxxxxxx>


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@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 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
--- devel/arch/i386/kernel/traps.c~i386-print-stack-size-in-oops-messages	2006-06-04 23:30:50.000000000 -0700
+++ devel-akpm/arch/i386/kernel/traps.c	2006-06-04 23:32:42.000000000 -0700
@@ -406,34 +406,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) (&regs->esp);
_

Patches currently in -mm which might be from 76306.1226@xxxxxxxxxxxxxx are

i386-let-usermode-execute-the-enter.patch
i386-fix-get_segment_eip-with-vm86.patch
i386-dont-try-kprobes-for-v8086-mode.patch
i386-print-stack-size-in-oops-messages.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html