aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index ec06aa5e9282..9e144fbebd20 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -284,12 +284,6 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
284 if (!hw_event->exclude_kernel) 284 if (!hw_event->exclude_kernel)
285 hwc->config |= ARCH_PERFMON_EVENTSEL_OS; 285 hwc->config |= ARCH_PERFMON_EVENTSEL_OS;
286 286
287 /*
288 * Use NMI events all the time:
289 */
290 hwc->nmi = 1;
291 hw_event->nmi = 1;
292
293 if (!hwc->sample_period) 287 if (!hwc->sample_period)
294 hwc->sample_period = x86_pmu.max_period; 288 hwc->sample_period = x86_pmu.max_period;
295 289