diff options
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index e52a9e577783..ab3395295224 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -403,7 +403,8 @@ int x86_pmu_hw_config(struct perf_event *event) | |||
| 403 | * check that PEBS LBR correction does not conflict with | 403 | * check that PEBS LBR correction does not conflict with |
| 404 | * whatever the user is asking with attr->branch_sample_type | 404 | * whatever the user is asking with attr->branch_sample_type |
| 405 | */ | 405 | */ |
| 406 | if (event->attr.precise_ip > 1) { | 406 | if (event->attr.precise_ip > 1 && |
| 407 | x86_pmu.intel_cap.pebs_format < 2) { | ||
| 407 | u64 *br_type = &event->attr.branch_sample_type; | 408 | u64 *br_type = &event->attr.branch_sample_type; |
| 408 | 409 | ||
| 409 | if (has_branch_stack(event)) { | 410 | if (has_branch_stack(event)) { |