From: Sameer Nanda <snanda@chromium.org>
Date: Thu, 3 May 2012 05:44:15 +0000 (+1000)
Subject: watchdog: fix for lockup detector breakage on resume
X-Git-Tag: next-20120503~2^2~127
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c47920afb82d050b0b2fbe779bc324b880cb93a9;p=karo-tx-linux.git

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 38f39007546f..903261706571 100644
--- 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