watchdog: fix for lockup detector breakage on resume

Signed-off-by: Sameer Nanda <snanda@chromium.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Mandeep Singh Baines <msb@chromium.org>
Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 38f39007546f1f427ca265381cc28fa99a465165..90326170657176336f978105d65199599a4b4bcd 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -608,8 +608,9 @@ void lockup_detector_bootcpu_resume(void)
 {
        void *cpu = (void *)(long)smp_processor_id();
 
-       cpu_callback(&cpu_nfb, CPU_DEAD, cpu);
-       cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
+       cpu_callback(&cpu_nfb, CPU_DEAD_FROZEN, cpu);
+       cpu_callback(&cpu_nfb, CPU_UP_PREPARE_FROZEN, cpu);
+       cpu_callback(&cpu_nfb, CPU_ONLINE_FROZEN, cpu);
 }
 #endif