diff options
| author | Jan Beulich <jbeulich@novell.com> | 2008-02-04 23:43:03 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-02-05 08:26:44 -0800 |
| commit | 620de2f5dc697f906408743b1139fe5fb7b0b7f8 (patch) | |
| tree | 01c731dfc3f8aca8f100482ef79d6795e03b4dba /arch/ia64/mm | |
| parent | ef3c4cb936d854d1564172f2dcce9c20d1b08761 (diff) | |
| download | op-kernel-dev-620de2f5dc697f906408743b1139fe5fb7b0b7f8.zip op-kernel-dev-620de2f5dc697f906408743b1139fe5fb7b0b7f8.tar.gz | |
[IA64] honor notify_die() returning NOTIFY_STOP
This requires making die() and die_if_kernel() return a value, and their
callers to honor this (and be prepared that it returns).
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm')
| -rw-r--r-- | arch/ia64/mm/fault.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index 7571076..3e69881 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: |
