From b05baffeddf80b8f3e48b499404628930fc46d8b Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Fri, 28 Jan 2011 11:00:33 -0500
Subject: [PATCH] --- yaml --- r: 232765 b: refs/heads/master c:
 9ffdc6c37df131f89d52001e0ef03091b158826f h: refs/heads/master i:   232763:
 aa1bcd4f096206031df1d3092fb0ec3802b33f3e v: v3

---
 [refs]                  |  2 +-
 trunk/kernel/watchdog.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fa114ccb36a1..80674d35f625 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 397357666de6b5b6adb5fa99f9758ec8cf30ac34
+refs/heads/master: 9ffdc6c37df131f89d52001e0ef03091b158826f
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
index c7e0049344bd..f37f974aa81b 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/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;
 }