Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15

[powerpc.git] / include / asm-x86_64 / kdebug.h

diff --git a/include/asm-x86_64/kdebug.h b/include/asm-x86_64/kdebug.h
index b903419..f604e84 100644 (file)
--- 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);
 extern void __die(const char *,struct pt_regs *,long);
 extern void show_registers(struct pt_regs *regs);
 extern void dump_pagetable(unsigned long);
-extern void oops_begin(void);
-extern void oops_end(void);
+extern unsigned long oops_begin(void);
+extern void oops_end(unsigned long);
 
 #endif