---

yaml --- r: 209974 b: refs/heads/master c: c6db67c h: refs/heads/master v: v3
git-mirror · Aug 23, 2010 · 17a60cf · 17a60cf
1 parent cbef73a
commit 17a60cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ede1b4290781ae82ccf0f2ecc6dada8d3dd35779
+refs/heads/master: c6db67cda735d8ace5f19c3831240e1408679790
diff --git a/trunk/kernel/watchdog.c b/trunk/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;