From 17a60cfb10c49e774f9552e514c1301706d0d134 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 20 Aug 2010 11:49:15 +0200
Subject: [PATCH] --- yaml --- r: 209974 b: refs/heads/master c:
 c6db67cda735d8ace5f19c3831240e1408679790 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/watchdog.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 931dd0bad74e..43664d438e76 100644
--- 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
index 613bc1f04610..0d53c8e853b1 100644
--- 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;