diff options
| author |   Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-10-19 14:38:11 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2010-10-22 14:18:25 +0200 |
| commit | 5553be2620ac901c21a25657bd5b59f73254e6d5 (patch) | |
| tree | 4b41f5433c5501a83aac453d42a0ea7f4927bb6a /arch/x86/kernel | |
| parent | perf, x86: Extract DS alloc/free functions (diff) | |
| download | linux-dev-5553be2620ac901c21a25657bd5b59f73254e6d5.tar.xz linux-dev-5553be2620ac901c21a25657bd5b59f73254e6d5.zip | |
perf, x86: Fixup the precise_ip computation
In case we don't have PEBS, the LBR fixup doesn't make sense.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Stephane Eranian <eranian@google.com>
LKML-Reference: <20101019134808.354429461@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index fe73c1844a9a..f369c53315a5 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -497,12 +497,13 @@ static int x86_pmu_hw_config(struct perf_event *event) int precise = 0; /* Support for constant skid */ - if (x86_pmu.pebs) + if (x86_pmu.pebs) { precise++; - /* Support for IP fixup */ - if (x86_pmu.lbr_nr) - precise++; + /* Support for IP fixup */ + if (x86_pmu.lbr_nr) + precise++; + } if (event->attr.precise_ip > precise) return -EOPNOTSUPP; |