summaryrefslogtreecommitdiff
path: root/drivers/bus
diff options
context:
space:
mode:
authorMark Salter <msalter@redhat.com>2015-04-28 20:09:32 +0300
committerArnd Bergmann <arnd@arndb.de>2015-05-07 19:29:18 +0300
commit454be2af5b49612e7f20ceb6683d5809ce848bee (patch)
tree1a8e9bc526c9eb14162b4eb48ce4195245ceb5e5 /drivers/bus
parentbd1a6e7b47246dd91c02d46f9a373822a1d972cc (diff)
downloadlinux-454be2af5b49612e7f20ceb6683d5809ce848bee.tar.xz
drivers: CCI: fix used_mask init in validate_group()
Currently in validate_group(), there is a static initializer for fake_pmu.used_mask which is based on CPU_BITS_NONE but the used_mask array size is based on CCI_PMU_MAX_HW_EVENTS. CCI_PMU_MAX_HW_EVENTS is not based on NR_CPUS, so CPU_BITS_NONE is not correct and will cause a build failure if NR_CPUS is set high enough to make CPU_BITS_NONE larger than used_mask. Reviewed-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Mark Salter <msalter@redhat.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/arm-cci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index b854125e4831..5340604b23a4 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -660,7 +660,7 @@ validate_group(struct perf_event *event)
* Initialise the fake PMU. We only need to populate the
* used_mask for the purposes of validation.
*/
- .used_mask = CPU_BITS_NONE,
+ .used_mask = { 0 },
};
if (!validate_event(event->pmu, &fake_pmu, leader))