From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755025Ab1A1QBH (ORCPT ); Fri, 28 Jan 2011 11:01:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33441 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753951Ab1A1QBF (ORCPT ); Fri, 28 Jan 2011 11:01:05 -0500 From: Don Zickus To: x86@kernel.org Cc: LKML , Marcin Slusarz , Don Zickus , Peter Zijlstra , Frederic Weisbecker , Ingo Molnar , stable@kernel.org Subject: [PATCH 3/3] watchdog: Don't change watchdog state on read of sysctl Date: Fri, 28 Jan 2011 11:00:33 -0500 Message-Id: <1296230433-6261-3-git-send-email-dzickus@redhat.com> In-Reply-To: <1296230433-6261-1-git-send-email-dzickus@redhat.com> References: <1296230433-6261-1-git-send-email-dzickus@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marcin Slusarz Signed-off-by: Marcin Slusarz Cc: Don Zickus Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: stable@kernel.org [ add {}'s to fix a warning ] Signed-off-by: Don Zickus --- kernel/watchdog.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 38af39a..6b16cb1 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; } -- 1.7.3.4