Pull bugzilla-7200 into release branch

[linux-2.6-omap-h63xx.git] / drivers / misc / ibmasm / heartbeat.c

diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c
index f295401fac21cb9f492fb3f75eb89e53dd4b6b4a..7fd7a43e38de4b4ff67611f39aa94fa33adb92db 100644 (file)
--- a/drivers/misc/ibmasm/heartbeat.c
+++ b/drivers/misc/ibmasm/heartbeat.c
@@ -52,12 +52,13 @@ static struct notifier_block panic_notifier = { panic_happened, NULL, 1 };
 
 void ibmasm_register_panic_notifier(void)
 {
-       notifier_chain_register(&panic_notifier_list, &panic_notifier);
+       atomic_notifier_chain_register(&panic_notifier_list, &panic_notifier);
 }
 
 void ibmasm_unregister_panic_notifier(void)
 {
-       notifier_chain_unregister(&panic_notifier_list, &panic_notifier);
+       atomic_notifier_chain_unregister(&panic_notifier_list,
+                       &panic_notifier);
 }