X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=arch%2Fia64%2Fmm%2Ffault.c;h=3e69881648a35ea1b91536b52eeb9387de9fd8d6;hb=620de2f5dc697f906408743b1139fe5fb7b0b7f8;hp=7571076a16a1991742af9f502b2113f7d9bd35a4;hpb=ef3c4cb936d854d1564172f2dcce9c20d1b08761;p=karo-tx-linux.git

diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 7571076a16a1..3e69881648a3 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -16,7 +16,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
-extern void die (char *, struct pt_regs *, long);
+extern int die(char *, struct pt_regs *, long);
 
 #ifdef CONFIG_KPROBES
 static inline int notify_page_fault(struct pt_regs *regs, int trap)
@@ -267,9 +267,11 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
 	else
 		printk(KERN_ALERT "Unable to handle kernel paging request at "
 		       "virtual address %016lx\n", address);
-	die("Oops", regs, isr);
+	if (die("Oops", regs, isr))
+		regs = NULL;
 	bust_spinlocks(0);
-	do_exit(SIGKILL);
+	if (regs)
+		do_exit(SIGKILL);
 	return;
 
   out_of_memory: