diff options
author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2011-01-28 11:00:33 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-01-31 07:22:43 -0500 |
commit | 9ffdc6c37df131f89d52001e0ef03091b158826f (patch) | |
tree | 3686727a7d9df74aa605c5c5ac4f64a0054fac0b /kernel | |
parent | 397357666de6b5b6adb5fa99f9758ec8cf30ac34 (diff) |
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 'kernel')
-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, | |||
493 | { | 493 | { |
494 | proc_dointvec(table, write, buffer, length, ppos); | 494 | proc_dointvec(table, write, buffer, length, ppos); |
495 | 495 | ||
496 | if (watchdog_enabled) | 496 | if (write) { |
497 | watchdog_enable_all_cpus(); | 497 | if (watchdog_enabled) |
498 | else | 498 | watchdog_enable_all_cpus(); |
499 | watchdog_disable_all_cpus(); | 499 | else |
500 | watchdog_disable_all_cpus(); | ||
501 | } | ||
500 | return 0; | 502 | return 0; |
501 | } | 503 | } |
502 | 504 | ||