From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755178Ab1A1QBT (ORCPT ); Fri, 28 Jan 2011 11:01:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62926 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753951Ab1A1QBJ (ORCPT ); Fri, 28 Jan 2011 11:01:09 -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 2/3] watchdog: Fix sysctl consistency Date: Fri, 28 Jan 2011 11:00:32 -0500 Message-Id: <1296230433-6261-2-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 If it was not possible to enable watchdog for any cpu, switch watchdog_enabled back to 0, because it's visible via kernel.watchdog sysctl. Signed-off-by: Marcin Slusarz Cc: Don Zickus Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: stable@kernel.org Signed-off-by: Don Zickus --- kernel/watchdog.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 7d4213e..38af39a 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -429,9 +429,6 @@ static int watchdog_enable(int cpu) wake_up_process(p); } - /* if any cpu succeeds, watchdog is considered enabled for the system */ - watchdog_enabled = 1; - return 0; } @@ -459,12 +456,16 @@ static void watchdog_disable(int cpu) static void watchdog_enable_all_cpus(void) { int cpu; - int result = 0; + + watchdog_enabled = 0; for_each_online_cpu(cpu) - result += watchdog_enable(cpu); + if (!watchdog_enable(cpu)) + /* if any cpu succeeds, watchdog is considered + enabled for the system */ + watchdog_enabled = 1; - if (result) + if (!watchdog_enabled) printk(KERN_ERR "watchdog: failed to be enabled on some cpus\n"); } -- 1.7.3.4