aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 12:21:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 12:21:49 -0700
commit502adf5778f4151dcba3f64dd6ed322151f3712c (patch)
treead14adb37dedaefabdaf93b08ab9d32bc140ed81 /kernel
parent3b6c5507a69861e80c26f21d04601c674cbeec3d (diff)
parentc6db67cda735d8ace5f19c3831240e1408679790 (diff)
downloadmrst-s0i3-test-502adf5778f4151dcba3f64dd6ed322151f3712c.tar.gz
mrst-s0i3-test-502adf5778f4151dcba3f64dd6ed322151f3712c.tar.xz
mrst-s0i3-test-502adf5778f4151dcba3f64dd6ed322151f3712c.zip
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: watchdog: Don't throttle the watchdog tracing: Fix timer tracing
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;