2 files changed, 16 insertions, 4 deletions

diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 3627a2d7f79f..298f2ddb2c17 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -499,11 +499,16 @@ static int led_halt(struct notifier_block *, unsigned long, void *);
 static struct notifier_block led_notifier = {
         .notifier_call = led_halt,
 };
+static int notifier_disabled = 0;
 
 static int led_halt(struct notifier_block *nb, unsigned long event, void *buf) 
 {
         char *txt;
-        
+
+        if (notifier_disabled)
+                return NOTIFY_OK;
+
+        notifier_disabled = 1;
         switch (event) {
         case SYS_RESTART:       txt = "SYSTEM RESTART";
                                 break;
@@ -527,7 +532,6 @@ static int led_halt(struct notifier_block *nb, unsigned long event, void *buf)
                 if (led_func_ptr)
                         led_func_ptr(0xff); /* turn all LEDs ON */
         
-        unregister_reboot_notifier(&led_notifier);
         return NOTIFY_OK;
 }
 
@@ -758,6 +762,12 @@ not_found:
         return 1;
 }
 
+static void __exit led_exit(void)
+{
+        unregister_reboot_notifier(&led_notifier);
+        return;
+}
+
 #ifdef CONFIG_PROC_FS
 module_init(led_create_procfs)
 #endif
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 54b2b7f20b96..0bcab83b4080 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -251,7 +251,8 @@ static int __init power_init(void)
         }
 
         /* Register a call for panic conditions. */
-        notifier_chain_register(&panic_notifier_list, &parisc_panic_block);
+        atomic_notifier_chain_register(&panic_notifier_list,
+                        &parisc_panic_block);
 
         tasklet_enable(&power_tasklet);
 
@@ -264,7 +265,8 @@ static void __exit power_exit(void)
                 return;
 
         tasklet_disable(&power_tasklet);
-        notifier_chain_unregister(&panic_notifier_list, &parisc_panic_block);
+        atomic_notifier_chain_unregister(&panic_notifier_list,
+                        &parisc_panic_block);
         power_tasklet.func = NULL;
         pdc_soft_power_button(0);
 }