---

yaml --- r: 232765 b: refs/heads/master c: 9ffdc6c h: refs/heads/master i: 232763: aa1bcd4 v: v3
git-mirror · Jan 31, 2011 · b05baff · b05baff
1 parent a49de7b
commit b05baff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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;
 }