diff options
author | Jan Beulich <jbeulich@novell.com> | 2008-02-05 02:43:03 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-02-05 11:26:44 -0500 |
commit | 620de2f5dc697f906408743b1139fe5fb7b0b7f8 (patch) | |
tree | 01c731dfc3f8aca8f100482ef79d6795e03b4dba /arch/ia64/mm/fault.c | |
parent | ef3c4cb936d854d1564172f2dcce9c20d1b08761 (diff) |
[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/fault.c')
-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 7571076a16a1..3e69881648a3 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <asm/system.h> | 16 | #include <asm/system.h> |
17 | #include <asm/uaccess.h> | 17 | #include <asm/uaccess.h> |
18 | 18 | ||
19 | extern void die (char *, struct pt_regs *, long); | 19 | extern int die(char *, struct pt_regs *, long); |
20 | 20 | ||
21 | #ifdef CONFIG_KPROBES | 21 | #ifdef CONFIG_KPROBES |
22 | static inline int notify_page_fault(struct pt_regs *regs, int trap) | 22 | 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 | |||
267 | else | 267 | else |
268 | printk(KERN_ALERT "Unable to handle kernel paging request at " | 268 | printk(KERN_ALERT "Unable to handle kernel paging request at " |
269 | "virtual address %016lx\n", address); | 269 | "virtual address %016lx\n", address); |
270 | die("Oops", regs, isr); | 270 | if (die("Oops", regs, isr)) |
271 | regs = NULL; | ||
271 | bust_spinlocks(0); | 272 | bust_spinlocks(0); |
272 | do_exit(SIGKILL); | 273 | if (regs) |
274 | do_exit(SIGKILL); | ||
273 | return; | 275 | return; |
274 | 276 | ||
275 | out_of_memory: | 277 | out_of_memory: |