Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[mirror_ubuntu-artful-kernel.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index acd95adddb9387925e1f8861a0da59a65b1f9a96..f895c7c01d5b18b4140dae5e35b284589380e481 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -29,7 +29,7 @@ static DEFINE_SPINLOCK(pause_on_oops_lock);
 int panic_timeout;
 EXPORT_SYMBOL(panic_timeout);
 
-struct notifier_block *panic_notifier_list;
+ATOMIC_NOTIFIER_HEAD(panic_notifier_list);
 
 EXPORT_SYMBOL(panic_notifier_list);
 
@@ -97,7 +97,7 @@ NORET_TYPE void panic(const char * fmt, ...)
        smp_send_stop();
 #endif
 
-       notifier_call_chain(&panic_notifier_list, 0, buf);
+       atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
 
        if (!panic_blink)
                panic_blink = no_blink;