nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix

fiddle with code comment

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

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 85b8f3233f30a3021a67892e75f4c3f5205e5a10..de8c56c8b763b760236230d80fefc0ca80a09eef 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -597,20 +597,17 @@ static struct notifier_block __cpuinitdata cpu_nfb = {
        .notifier_call = cpu_callback
 };
 
+/*
+ * On entry to suspend we force an offline->online transition on the boot CPU so
+ * that PMU state is available to that CPU when it comes back online after
+ * resume.  This information is required for restarting the NMI watchdog.
+ */
 void lockup_detector_bootcpu_resume(void)
 {
        void *cpu = (void *)(long)smp_processor_id();
 
-       /*
-        * On the suspend/resume path the boot CPU does not go though the
-        * offline->online transition. This breaks the NMI detector post
-        * resume. Force an offline->online transition for the boot CPU on
-        * resume.
-        */
        cpu_callback(&cpu_nfb, CPU_DEAD, cpu);
        cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
-
-       return;
 }
 
 void __init lockup_detector_init(void)