Merge tag '3.9-rc3-smp-6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabe...

[mirror_ubuntu-bionic-kernel.git] / kernel / watchdog.c

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 4a944676358e841821a4b0d9a53ff312d2de9521..05039e348f07e242c63392a8758b8371c1a42beb 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -517,6 +517,11 @@ int proc_dowatchdog(struct ctl_table *table, int write,
                return ret;
 
        set_sample_period();
+       /*
+        * Watchdog threads shouldn't be enabled if they are
+        * disabled. The 'watchdog_disabled' variable check in
+        * watchdog_*_all_cpus() function takes care of this.
+        */
        if (watchdog_enabled && watchdog_thresh)
                watchdog_enable_all_cpus();
        else