- 2.6.17 port work build breaks, but the patch set is relativly stable

[linux-flexiantxendom0-3.2.10.git] / include / asm-i386 / kdebug.h

diff --git a/include/asm-i386/kdebug.h b/include/asm-i386/kdebug.h
index 3e474bf..96d0828 100644 (file)
--- a/include/asm-i386/kdebug.h
+++ b/include/asm-i386/kdebug.h
@@ -17,11 +17,9 @@ struct die_args {
        int signr;
 };
 
-/* Note - you should never unregister because that can race with NMIs.
-   If you really want to do it first unregister - then synchronize_sched - then free.
-  */
-int register_die_notifier(struct notifier_block *nb);
-extern struct notifier_block *i386die_chain;
+extern int register_die_notifier(struct notifier_block *);
+extern int unregister_die_notifier(struct notifier_block *);
+extern struct atomic_notifier_head i386die_chain;
 
 
 /* Grossly misnamed. */
@@ -34,8 +32,6 @@ enum die_val {
        DIE_DIE,
        DIE_NMIWATCHDOG,
        DIE_KERNELDEBUG,
-       DIE_KDEBUG_ENTER,
-       DIE_KDEBUG_LEAVE,
        DIE_TRAP,
        DIE_GPF,
        DIE_CALL,
@@ -53,7 +49,7 @@ static inline int notify_die(enum die_val val, const char *str,
                .trapnr = trap,
                .signr = sig
        };
-       return notifier_call_chain(&i386die_chain, val, &args);
+       return atomic_notifier_call_chain(&i386die_chain, val, &args);
 }
 
 #endif