patch-2.1.109 linux/arch/i386/mm/fault.c

Next file: linux/arch/i386/mm/init.c
Previous file: linux/arch/i386/kernel/traps.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.108/linux/arch/i386/mm/fault.c linux/arch/i386/mm/fault.c
@@ -22,7 +22,7 @@
 #include <asm/pgtable.h>
 #include <asm/hardirq.h>
 
-extern void die_if_kernel(const char *,struct pt_regs *,long);
+extern void die(const char *,struct pt_regs *,long);
 
 /*
  * Ugly, ugly, but the goto's result in better assembly..
@@ -101,7 +101,7 @@
 	__asm__("movl %%cr2,%0":"=r" (address));
 
 	if (local_irq_count[smp_processor_id()])
-		die_if_kernel("page fault from irq handler",regs,error_code);
+		die("page fault from irq handler",regs,error_code);
 	tsk = current;
 	mm = tsk->mm;
 
@@ -235,7 +235,7 @@
 		printk(KERN_ALERT "*pte = %08lx\n", page);
 	}
 	lock_kernel();
-	die_if_kernel("Oops", regs, error_code);
+	die("Oops", regs, error_code);
 	do_exit(SIGKILL);
 	unlock_kernel();
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov