diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2011-01-28 11:00:33 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:47:22 -0800 |
| commit | 91bbb90c3b953b03fae72a22ae7a0713a48b3dba (patch) | |
| tree | 3b974a5882ff77ed157c6260d3d68fabeaff7273 /kernel | |
| parent | 615563d11619a5df5c95577236888434c78e54a9 (diff) | |
watchdog: Don't change watchdog state on read of sysctl
commit 9ffdc6c37df131f89d52001e0ef03091b158826f upstream.
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>
LKML-Reference: <1296230433-6261-3-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 93e61c55b7fa..e359b2e7e7d5 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -505,10 +505,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; } |