diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2011-01-28 11:00:32 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 15:14:45 -0800 |
| commit | a716ed74c75843f5e15c1cf2dedd6de8a882bd9c (patch) | |
| tree | 2c472c0065bb1d29aee09570a31e7da58d417fa0 | |
| parent | 49ae676572f86b2603bd3bd3f246a7c84ec25492 (diff) | |
| download | linux-hpc-a716ed74c75843f5e15c1cf2dedd6de8a882bd9c.tar.gz | |
watchdog: Fix sysctl consistency
commit 397357666de6b5b6adb5fa99f9758ec8cf30ac34 upstream.
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 <marcin.slusarz@gmail.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <1296230433-6261-2-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/watchdog.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 5b082156cd2146..b4560a8480c948 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -430,9 +430,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; } @@ -460,12 +457,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"); } |