patch-2.1.32 linux/arch/i386/kernel/traps.c

• Lines: 40
• Date: Thu Apr 3 10:35:53 1997
• Orig file: v2.1.31/linux/arch/i386/kernel/traps.c
• Orig date: Thu Mar 27 14:39:59 1997

diff -u --recursive --new-file v2.1.31/linux/arch/i386/kernel/traps.c linux/arch/i386/kernel/traps.c
@@ -114,7 +114,7 @@
 #define VMALLOC_OFFSET (8*1024*1024)
 #define MODULE_RANGE (8*1024*1024)
 
-/*static*/ void die_if_kernel(const char * str, struct pt_regs * regs, long err)
+static void show_regs(struct pt_regs *regs)
 {
 	int i;
 	unsigned long esp;
@@ -130,8 +130,6 @@
 		esp = regs->esp;
 		ss = regs->xss & 0xffff;
 	}
-	console_verbose();
-	printk("%s: %04lx\n", str, err & 0xffff);
 	printk("CPU:    %d\n", smp_processor_id());
 	printk("EIP:    %04x:[<%08lx>]\nEFLAGS: %08lx\n", 0xffff & regs->xcs,regs->eip,regs->eflags);
 	printk("eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",
@@ -182,6 +180,13 @@
 	for(i=0;i<20;i++)
 		printk("%02x ",0xff & get_seg_byte(regs->xcs & 0xffff,(i+(char *)regs->eip)));
 	printk("\n");
+}	
+
+/*static*/ void die_if_kernel(const char * str, struct pt_regs * regs, long err)
+{
+	console_verbose();
+	printk("%s: %04lx\n", str, err & 0xffff);
+	show_regs(regs);
 	do_exit(SIGSEGV);
 }
 
@@ -231,6 +236,7 @@
 
 asmlinkage void do_nmi(struct pt_regs * regs, long error_code)
 {
+	printk("NMI\n"); show_regs(regs);
 #ifdef CONFIG_SMP_NMI_INVAL
 	smp_flush_tlb_rcv();
 #else