1 files changed, 5 insertions, 3 deletions

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: