diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-09 20:40:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-09 20:40:08 +0200 |
| commit | 2aa61274efb9f532deaebc9812675a27af1994cb (patch) | |
| tree | c2f70525dc152e0ddce60f1a3021473cc6a3f298 /kernel/watchdog.c | |
| parent | 359d5106a2ff4ffa2ba129ec8f54743c341dabfc (diff) | |
| parent | 5e11637e2c929e34dcc0fbbfb48bdb638937701a (diff) | |
| download | linux-3.10-2aa61274efb9f532deaebc9812675a27af1994cb.tar.gz linux-3.10-2aa61274efb9f532deaebc9812675a27af1994cb.tar.bz2 linux-3.10-2aa61274efb9f532deaebc9812675a27af1994cb.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up pending fixes before applying dependent new changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/watchdog.c')
| -rw-r--r-- | kernel/watchdog.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 5b1ee4f4ca0..fa71aebda4f 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -121,7 +121,7 @@ static void __touch_watchdog(void) void touch_softlockup_watchdog(void) { - __get_cpu_var(watchdog_touch_ts) = 0; + __raw_get_cpu_var(watchdog_touch_ts) = 0; } EXPORT_SYMBOL(touch_softlockup_watchdog); @@ -141,7 +141,14 @@ void touch_all_softlockup_watchdogs(void) #ifdef CONFIG_HARDLOCKUP_DETECTOR void touch_nmi_watchdog(void) { - __get_cpu_var(watchdog_nmi_touch) = true; + if (watchdog_enabled) { + unsigned cpu; + + for_each_present_cpu(cpu) { + if (per_cpu(watchdog_nmi_touch, cpu) != true) + per_cpu(watchdog_nmi_touch, cpu) = true; + } + } touch_softlockup_watchdog(); } EXPORT_SYMBOL(touch_nmi_watchdog); @@ -422,6 +429,9 @@ 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; } @@ -444,9 +454,6 @@ static void watchdog_disable(int cpu) per_cpu(softlockup_watchdog, cpu) = NULL; kthread_stop(p); } - - /* if any cpu succeeds, watchdog is considered enabled for the system */ - watchdog_enabled = 1; } static void watchdog_enable_all_cpus(void) |