watchdog/hardlockup: Clean up hotplug locking mess

[linux-2.6-block.git] / arch / powerpc / kernel / watchdog.c

diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
index 291af79a98263e023ef4e2dd0642a04e027b4333..dfb0677644801da9c7d2b417142fed7ba4440220 100644 (file)
--- a/arch/powerpc/kernel/watchdog.c
+++ b/arch/powerpc/kernel/watchdog.c
@@ -359,6 +359,7 @@ void watchdog_nmi_reconfigure(bool run)
 {
        int cpu;
 
+       cpus_read_lock();
        if (!run) {
                for_each_cpu(cpu, &wd_cpus_enabled)
                        stop_wd_on_cpu(cpu);
@@ -367,6 +368,7 @@ void watchdog_nmi_reconfigure(bool run)
                for_each_cpu_and(cpu, cpu_online_mask, &watchdog_cpumask)
                        start_wd_on_cpu(cpu);
        }
+       cpus_read_unlock();
 }
 
 /*