aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/perf_event.c
diff options
context:
space:
mode:
authorFranck Bui-Huu <fbuihuu@gmail.com>2010-11-23 10:21:43 -0500
committerIngo Molnar <mingo@elte.hu>2010-11-26 09:14:54 -0500
commit6c7e550f13f8ad82efb6a5653ae628c2543c1768 (patch)
tree1c994b999648fbe51ffe4312e2d6827aedd5f012 /arch/x86/kernel/cpu/perf_event.c
parent35d3778a8fe3c8b4a7513565e34d3bde00ce43ec (diff)
perf: Introduce is_sampling_event()
and use it when appropriate. Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <1290525705-6265-1-git-send-email-fbuihuu@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event.c')
-rw-r--r--arch/x86/kernel/cpu/perf_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 7c1a4c35fd4..c01dfec635d 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -442,7 +442,7 @@ static int x86_setup_perfctr(struct perf_event *event)
442 struct hw_perf_event *hwc = &event->hw; 442 struct hw_perf_event *hwc = &event->hw;
443 u64 config; 443 u64 config;
444 444
445 if (!hwc->sample_period) { 445 if (!is_sampling_event(event)) {
446 hwc->sample_period = x86_pmu.max_period; 446 hwc->sample_period = x86_pmu.max_period;
447 hwc->last_period = hwc->sample_period; 447 hwc->last_period = hwc->sample_period;
448 local64_set(&hwc->period_left, hwc->sample_period); 448 local64_set(&hwc->period_left, hwc->sample_period);