diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /include/asm-x86_64/kdebug.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-x86_64/kdebug.h')
| -rw-r--r-- | include/asm-x86_64/kdebug.h | 4 |
1 files changed, 2 insertions, 2 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 |