diff options
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r-- | include/asm-x86_64/kdebug.h | 4 | ||||
-rw-r--r-- | include/asm-x86_64/proto.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-x86_64/kdebug.h b/include/asm-x86_64/kdebug.h index b90341994d80..f604e84c5303 100644 --- a/include/asm-x86_64/kdebug.h +++ b/include/asm-x86_64/kdebug.h | |||
@@ -46,7 +46,7 @@ extern void die(const char *,struct pt_regs *,long); | |||
46 | extern void __die(const char *,struct pt_regs *,long); | 46 | extern void __die(const char *,struct pt_regs *,long); |
47 | extern void show_registers(struct pt_regs *regs); | 47 | extern void show_registers(struct pt_regs *regs); |
48 | extern void dump_pagetable(unsigned long); | 48 | extern void dump_pagetable(unsigned long); |
49 | extern void oops_begin(void); | 49 | extern unsigned long oops_begin(void); |
50 | extern void oops_end(void); | 50 | extern void oops_end(unsigned long); |
51 | 51 | ||
52 | #endif | 52 | #endif |
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index 764b5f822ce2..dbb37b0adb43 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h | |||
@@ -74,9 +74,6 @@ extern void acpi_reserve_bootmem(void); | |||
74 | 74 | ||
75 | extern void swap_low_mappings(void); | 75 | extern void swap_low_mappings(void); |
76 | 76 | ||
77 | extern void oops_begin(void); | ||
78 | extern void die(const char *,struct pt_regs *,long); | ||
79 | extern void __die(const char * str, struct pt_regs * regs, long err); | ||
80 | extern void __show_regs(struct pt_regs * regs); | 77 | extern void __show_regs(struct pt_regs * regs); |
81 | extern void show_regs(struct pt_regs * regs); | 78 | extern void show_regs(struct pt_regs * regs); |
82 | 79 | ||