diff options
author | Jan Beulich <jbeulich@novell.com> | 2008-01-30 07:31:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:23 -0500 |
commit | 22f5991c85dec1281cce5c8df9ee92b43b1738c8 (patch) | |
tree | 9a0814a5b3c37b3752ee7dfcc6f6b2b6793dfe91 /include | |
parent | d88879b2d0225da3ba460bbdb8361bb049653671 (diff) |
x86-64: honor notify_die() returning NOTIFY_STOP
This requires making die() return a value, making its callers honor
this (and be prepared that it may return), and making oops_end() have
two additional parameters.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/kdebug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/kdebug.h b/include/asm-x86/kdebug.h index 49e5c91d490c..a5e5e3b7eb23 100644 --- a/include/asm-x86/kdebug.h +++ b/include/asm-x86/kdebug.h | |||
@@ -25,7 +25,7 @@ enum die_val { | |||
25 | extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2))); | 25 | extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2))); |
26 | extern void printk_address(unsigned long address); | 26 | extern void printk_address(unsigned long address); |
27 | extern void die(const char *,struct pt_regs *,long); | 27 | extern void die(const char *,struct pt_regs *,long); |
28 | extern void __die(const char *,struct pt_regs *,long); | 28 | extern int __must_check __die(const char *, struct pt_regs *, long); |
29 | extern void show_registers(struct pt_regs *regs); | 29 | extern void show_registers(struct pt_regs *regs); |
30 | extern void __show_registers(struct pt_regs *, int all); | 30 | extern void __show_registers(struct pt_regs *, int all); |
31 | extern void show_trace(struct task_struct *, struct pt_regs *, unsigned long *); | 31 | extern void show_trace(struct task_struct *, struct pt_regs *, unsigned long *); |
@@ -33,6 +33,6 @@ extern void __show_regs(struct pt_regs *regs); | |||
33 | extern void show_regs(struct pt_regs *regs); | 33 | extern void show_regs(struct pt_regs *regs); |
34 | extern void dump_pagetable(unsigned long); | 34 | extern void dump_pagetable(unsigned long); |
35 | extern unsigned long oops_begin(void); | 35 | extern unsigned long oops_begin(void); |
36 | extern void oops_end(unsigned long); | 36 | extern void oops_end(unsigned long, struct pt_regs *, int signr); |
37 | 37 | ||
38 | #endif | 38 | #endif |