diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 12:21:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 12:21:49 -0700 |
| commit | 502adf5778f4151dcba3f64dd6ed322151f3712c (patch) | |
| tree | ad14adb37dedaefabdaf93b08ab9d32bc140ed81 /kernel | |
| parent | 3b6c5507a69861e80c26f21d04601c674cbeec3d (diff) | |
| parent | c6db67cda735d8ace5f19c3831240e1408679790 (diff) | |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 613bc1f04610..0d53c8e853b1 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; |