Merge branch 'linus' into tracing/sysprof

[linux-2.6-omap-h63xx.git] / include / asm-sparc64 / kdebug.h

diff --git a/include/asm-sparc64/kdebug.h b/include/asm-sparc64/kdebug.h
index 627e3396a5f0c136bf486eada3a6706b76f68486..f905b773235a2f977db3383559629d4fbd3e4fda 100644 (file)
--- a/include/asm-sparc64/kdebug.h
+++ b/include/asm-sparc64/kdebug.h
@@ -1,26 +1,8 @@
 #ifndef _SPARC64_KDEBUG_H
 #define _SPARC64_KDEBUG_H
 
-/* Nearly identical to x86_64/i386 code. */
-
-#include <linux/notifier.h>
-
 struct pt_regs;
 
-/*
- * These are only here because kprobes.c wants them to implement a
- * blatant layering violation.  Will hopefully go away soon once all
- * architectures are updated.
- */
-static inline int register_page_fault_notifier(struct notifier_block *nb)
-{
-       return 0;
-}
-static inline int unregister_page_fault_notifier(struct notifier_block *nb)
-{
-       return 0;
-}
-
 extern void bad_trap(struct pt_regs *, long);
 
 /* Grossly misnamed. */
@@ -32,7 +14,6 @@ enum die_val {
        DIE_TRAP,
        DIE_TRAP_TL1,
        DIE_CALL,
-       DIE_PAGE_FAULT,
 };
 
 #endif