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 | |
| parent | bcde519e8c325f3cc1fcf443eb6466e6bb3a3aca (diff) | |
| parent | c0f7f7acdecdd7cf9a19c0af5c3dc649e1b934f7 (diff) | |
| download | linux-9ad95c46c18ba828dfcf467024a45eb5b43ce769.tar.gz linux-9ad95c46c18ba828dfcf467024a45eb5b43ce769.tar.bz2 linux-9ad95c46c18ba828dfcf467024a45eb5b43ce769.zip | |
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')
| -rw-r--r-- | arch/arm/kernel/perf_event_v6.c | 2 | ||||
| -rw-r--r-- | arch/arm64/kernel/perf_event.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c index 96b7a477a8db..8226d0b71fd3 100644 --- a/arch/arm/kernel/perf_event_v6.c +++ b/arch/arm/kernel/perf_event_v6.c @@ -552,7 +552,7 @@ static int armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu) return 0; } -static struct of_device_id armv6_pmu_of_device_ids[] = { +static const struct of_device_id armv6_pmu_of_device_ids[] = { {.compatible = "arm,arm11mpcore-pmu", .data = armv6mpcore_pmu_init}, {.compatible = "arm,arm1176-pmu", .data = armv6_1176_pmu_init}, {.compatible = "arm,arm1136-pmu", .data = armv6_1136_pmu_init}, 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, |