Commit-ID: 9ffdc6c37df131f89d52001e0ef03091b158826f
Gitweb: http://git.kernel.org/tip/9ffdc6c37df131f89d52001e0ef03091b158826f
Author: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
AuthorDate: Fri, 28 Jan 2011 11:00:33 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Mon, 31 Jan 2011 13:22:43 +0100
watchdog: Don't change watchdog state on read of sysctl
Signed-off-by: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
[ add {}'s to fix a warning ]
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
LKML-Reference: <1296230433-6261-3-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/watchdog.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index c7e0049..f37f974 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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|