diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2011-01-28 17:00:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-31 13:22:43 +0100 |
| commit | 9ffdc6c37df131f89d52001e0ef03091b158826f (patch) | |
| tree | 3686727a7d9df74aa605c5c5ac4f64a0054fac0b /kernel/watchdog.c | |
| parent | watchdog: Fix sysctl consistency (diff) | |
| download | linux-9ffdc6c37df131f89d52001e0ef03091b158826f.tar.xz linux-9ffdc6c37df131f89d52001e0ef03091b158826f.zip | |
watchdog: Don't change watchdog state on read of sysctl
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
[ add {}'s to fix a warning ]
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: <stable@kernel.org>
LKML-Reference: <1296230433-6261-3-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '')
| -rw-r--r-- | kernel/watchdog.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index c7e0049344bd..f37f974aa81b 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -493,10 +493,12 @@ int proc_dowatchdog_enabled(struct ctl_table *table, int write, { proc_dointvec(table, write, buffer, length, ppos); - if (watchdog_enabled) - watchdog_enable_all_cpus(); - else - watchdog_disable_all_cpus(); + if (write) { + if (watchdog_enabled) + watchdog_enable_all_cpus(); + else + watchdog_disable_all_cpus(); + } return 0; } |