diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-06-26 10:50:50 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-26 10:50:50 +0100 |
| commit | 9ad95c46c18ba828dfcf467024a45eb5b43ce769 (patch) | |
| tree | 7eba8cc261ea3cf4d9f53751fd861cc4c22d996f /arch/arm64 | |
| parent | bcde519e8c325f3cc1fcf443eb6466e6bb3a3aca (diff) | |
| parent | c0f7f7acdecdd7cf9a19c0af5c3dc649e1b934f7 (diff) | |
Merge branch 'perf/updates' into aarch64/for-next/core
Merge in arm64 perf updates:
* xgene system PMUv3 support
* 16-bit events for ARMv8.1
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 83a1b1ad189f..b5798ba21189 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -529,7 +529,7 @@ static struct attribute_group armv8_pmuv3_events_attr_group = { .is_visible = armv8pmu_event_attr_is_visible, }; -PMU_FORMAT_ATTR(event, "config:0-9"); +PMU_FORMAT_ATTR(event, "config:0-15"); static struct attribute *armv8_pmuv3_format_attrs[] = { &format_attr_event.attr, |