aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-08-20 11:49:15 +0200
committerIngo Molnar <mingo@elte.hu>2010-08-23 10:48:05 +0200
commitc6db67cda735d8ace5f19c3831240e1408679790 (patch)
tree8512efd772cb3d3f30b49001890c93a22f2db50f /kernel
parentede1b4290781ae82ccf0f2ecc6dada8d3dd35779 (diff)
downloadmrst-s0i3-test-c6db67cda735d8ace5f19c3831240e1408679790.tar.gz
mrst-s0i3-test-c6db67cda735d8ace5f19c3831240e1408679790.tar.xz
mrst-s0i3-test-c6db67cda735d8ace5f19c3831240e1408679790.zip
watchdog: Don't throttle the watchdog
Stephane reported that when the machine locks up, the regular ticks, which are responsible to resetting the throttle count, stop too. Hence the NMI watchdog can end up being throttled before it reports on the locked up state, and we end up being sad.. Cure this by having the watchdog overflow reset its own throttle count. Reported-by: Stephane Eranian <eranian@google.com> Tested-by: Stephane Eranian <eranian@google.com> Cc: Don Zickus <dzickus@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <1282215916.1926.4696.camel@laptop> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/watchdog.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 613bc1f0461..0d53c8e853b 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -206,6 +206,9 @@ void watchdog_overflow_callback(struct perf_event *event, int nmi,
struct perf_sample_data *data,
struct pt_regs *regs)
{
+ /* Ensure the watchdog never gets throttled */
+ event->hw.interrupts = 0;
+
if (__get_cpu_var(watchdog_nmi_touch) == true) {
__get_cpu_var(watchdog_nmi_touch) = false;
return;