Merge git://git.infradead.org/~dwmw2/random-2.6

[pandora-kernel.git] / include / asm-sparc64 / kdebug.h

diff --git a/include/asm-sparc64/kdebug.h b/include/asm-sparc64/kdebug.h
index 627e339..78cfd5d 100644 (file)
--- a/include/asm-sparc64/kdebug.h
+++ b/include/asm-sparc64/kdebug.h
@@ -1,38 +1 @@
-#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. */
-enum die_val {
-       DIE_OOPS = 1,
-       DIE_DEBUG,      /* ta 0x70 */
-       DIE_DEBUG_2,    /* ta 0x71 */
-       DIE_DIE,
-       DIE_TRAP,
-       DIE_TRAP_TL1,
-       DIE_CALL,
-       DIE_PAGE_FAULT,
-};
-
-#endif
+#include <asm-sparc/kdebug.h>