diff options
| -rw-r--r-- | arch/x86/events/intel/pt.c | 3 | ||||
| -rw-r--r-- | include/linux/perf_event.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c index fb3a2f13fc70..339d7628080c 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c | |||
| @@ -1525,8 +1525,7 @@ static __init int pt_init(void) | |||
| 1525 | } | 1525 | } |
| 1526 | 1526 | ||
| 1527 | if (!intel_pt_validate_hw_cap(PT_CAP_topa_multiple_entries)) | 1527 | if (!intel_pt_validate_hw_cap(PT_CAP_topa_multiple_entries)) |
| 1528 | pt_pmu.pmu.capabilities = | 1528 | pt_pmu.pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG; |
| 1529 | PERF_PMU_CAP_AUX_NO_SG | PERF_PMU_CAP_AUX_SW_DOUBLEBUF; | ||
| 1530 | 1529 | ||
| 1531 | pt_pmu.pmu.capabilities |= PERF_PMU_CAP_EXCLUSIVE | PERF_PMU_CAP_ITRACE; | 1530 | pt_pmu.pmu.capabilities |= PERF_PMU_CAP_EXCLUSIVE | PERF_PMU_CAP_ITRACE; |
| 1532 | pt_pmu.pmu.attr_groups = pt_attr_groups; | 1531 | pt_pmu.pmu.attr_groups = pt_attr_groups; |
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index e47ef764f613..1f678f023850 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
| @@ -240,7 +240,6 @@ struct perf_event; | |||
| 240 | #define PERF_PMU_CAP_NO_INTERRUPT 0x01 | 240 | #define PERF_PMU_CAP_NO_INTERRUPT 0x01 |
| 241 | #define PERF_PMU_CAP_NO_NMI 0x02 | 241 | #define PERF_PMU_CAP_NO_NMI 0x02 |
| 242 | #define PERF_PMU_CAP_AUX_NO_SG 0x04 | 242 | #define PERF_PMU_CAP_AUX_NO_SG 0x04 |
| 243 | #define PERF_PMU_CAP_AUX_SW_DOUBLEBUF 0x08 | ||
| 244 | #define PERF_PMU_CAP_EXCLUSIVE 0x10 | 243 | #define PERF_PMU_CAP_EXCLUSIVE 0x10 |
| 245 | #define PERF_PMU_CAP_ITRACE 0x20 | 244 | #define PERF_PMU_CAP_ITRACE 0x20 |
| 246 | #define PERF_PMU_CAP_HETEROGENEOUS_CPUS 0x40 | 245 | #define PERF_PMU_CAP_HETEROGENEOUS_CPUS 0x40 |
