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

• Lines: 40
• Date: Mon Apr 7 18:52:09 1997
• Orig file: v2.1.32/linux/arch/i386/kernel/traps.c
• Orig date: Mon Apr 7 11:35:29 1997

diff -u --recursive --new-file v2.1.32/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 show_regs(struct pt_regs *regs)
+static void show_registers(struct pt_regs *regs)
 {
 	int i;
 	unsigned long esp;
@@ -124,8 +124,6 @@
 
 	esp = (unsigned long) &regs->esp;
 	ss = KERNEL_DS;
-	if ((regs->eflags & VM_MASK) || (3 & regs->xcs) == 3)
-		return;
 	if (regs->xcs & 3) {
 		esp = regs->esp;
 		ss = regs->xss & 0xffff;
@@ -184,9 +182,11 @@
 
 /*static*/ void die_if_kernel(const char * str, struct pt_regs * regs, long err)
 {
+	if ((regs->eflags & VM_MASK) || (3 & regs->xcs) == 3)
+		return;
 	console_verbose();
 	printk("%s: %04lx\n", str, err & 0xffff);
-	show_regs(regs);
+	show_registers(regs);
 	do_exit(SIGSEGV);
 }
 
@@ -236,7 +236,7 @@
 
 asmlinkage void do_nmi(struct pt_regs * regs, long error_code)
 {
-	printk("NMI\n"); show_regs(regs);
+	printk("NMI\n"); show_registers(regs);
 #ifdef CONFIG_SMP_NMI_INVAL
 	smp_flush_tlb_rcv();
 #else