Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

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

diff --git a/include/asm-ia64/kdebug.h b/include/asm-ia64/kdebug.h
index 8b01a083dde6f94dd391e042ccc641212fcf06a4..218c458ab60c8ef34d69aa95942f8709f0f29eee 100644 (file)
--- a/include/asm-ia64/kdebug.h
+++ b/include/asm-ia64/kdebug.h
@@ -40,7 +40,7 @@ struct die_args {
 
 extern int register_die_notifier(struct notifier_block *);
 extern int unregister_die_notifier(struct notifier_block *);
-extern struct notifier_block *ia64die_chain;
+extern struct atomic_notifier_head ia64die_chain;
 
 enum die_val {
        DIE_BREAK = 1,
@@ -81,7 +81,7 @@ static inline int notify_die(enum die_val val, char *str, struct pt_regs *regs,
                .signr  = sig
        };
 
-       return notifier_call_chain(&ia64die_chain, val, &args);
+       return atomic_notifier_call_chain(&ia64die_chain, val, &args);
 }
 
 #endif