Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

[mv-sheeva.git] / include / asm-ia64 / kdebug.h

diff --git a/include/asm-ia64/kdebug.h b/include/asm-ia64/kdebug.h
index 218c458ab60c8ef34d69aa95942f8709f0f29eee..ba211e011a1d4d22dcfa4d8d7a0bcaed3a9747e1 100644 (file)
--- a/include/asm-ia64/kdebug.h
+++ b/include/asm-ia64/kdebug.h
@@ -28,19 +28,8 @@
  */
 #include <linux/notifier.h>
 
-struct pt_regs;
-
-struct die_args {
-       struct pt_regs *regs;
-       const char *str;
-       long err;
-       int trapnr;
-       int signr;
-};
-
-extern int register_die_notifier(struct notifier_block *);
-extern int unregister_die_notifier(struct notifier_block *);
-extern struct atomic_notifier_head ia64die_chain;
+extern int register_page_fault_notifier(struct notifier_block *);
+extern int unregister_page_fault_notifier(struct notifier_block *);
 
 enum die_val {
        DIE_BREAK = 1,
@@ -58,6 +47,8 @@ enum die_val {
        DIE_MCA_RENDZVOUS_ENTER,
        DIE_MCA_RENDZVOUS_PROCESS,
        DIE_MCA_RENDZVOUS_LEAVE,
+       DIE_MCA_NEW_TIMEOUT,
+       DIE_INIT_ENTER,
        DIE_INIT_MONARCH_ENTER,
        DIE_INIT_MONARCH_PROCESS,
        DIE_INIT_MONARCH_LEAVE,
@@ -70,18 +61,4 @@ enum die_val {
        DIE_KDUMP_LEAVE,
 };
 
-static inline int notify_die(enum die_val val, char *str, struct pt_regs *regs,
-                            long err, int trap, int sig)
-{
-       struct die_args args = {
-               .regs   = regs,
-               .str    = str,
-               .err    = err,
-               .trapnr = trap,
-               .signr  = sig
-       };
-
-       return atomic_notifier_call_chain(&ia64die_chain, val, &args);
-}
-
 #endif