aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/perf_event.c4
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 632e5dc9c9c0..fac0654021b8 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -613,8 +613,8 @@ static int x86_setup_perfctr(struct perf_event *event)
613 /* 613 /*
614 * Branch tracing: 614 * Branch tracing:
615 */ 615 */
616 if ((attr->config == PERF_COUNT_HW_BRANCH_INSTRUCTIONS) && 616 if (attr->config == PERF_COUNT_HW_BRANCH_INSTRUCTIONS &&
617 (hwc->sample_period == 1)) { 617 !attr->freq && hwc->sample_period == 1) {
618 /* BTS is not supported by this architecture. */ 618 /* BTS is not supported by this architecture. */
619 if (!x86_pmu.bts_active) 619 if (!x86_pmu.bts_active)
620 return -EOPNOTSUPP; 620 return -EOPNOTSUPP;
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 43fa20b13817..9194b0698d63 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -998,6 +998,9 @@ intel_bts_constraints(struct perf_event *event)
998 struct hw_perf_event *hwc = &event->hw; 998 struct hw_perf_event *hwc = &event->hw;
999 unsigned int hw_event, bts_event; 999 unsigned int hw_event, bts_event;
1000 1000
1001 if (event->attr.freq)
1002 return NULL;
1003
1001 hw_event = hwc->config & INTEL_ARCH_EVENT_MASK; 1004 hw_event = hwc->config & INTEL_ARCH_EVENT_MASK;
1002 bts_event = x86_pmu.event_map(PERF_COUNT_HW_BRANCH_INSTRUCTIONS); 1005 bts_event = x86_pmu.event_map(PERF_COUNT_HW_BRANCH_INSTRUCTIONS);
1003 1006