Merge branch 'upstream'

[linux-2.6] / kernel / softlockup.c

diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index d9b3d5847ed8719c8fc57b410ddafe817adddee6..ced91e1ff5647329d71ce4082f70b5eddca9473e 100644 (file)
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -152,5 +152,5 @@ __init void spawn_softlockup_task(void)
        cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
        register_cpu_notifier(&cpu_nfb);
 
-       notifier_chain_register(&panic_notifier_list, &panic_block);
+       atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
 }