diff options
| author | Mark Salter <msalter@redhat.com> | 2015-04-28 19:09:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:29:18 +0200 |
| commit | 454be2af5b49612e7f20ceb6683d5809ce848bee (patch) | |
| tree | 1a8e9bc526c9eb14162b4eb48ce4195245ceb5e5 | |
| parent | Merge tag 'stericsson-fixes-v4.1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-454be2af5b49612e7f20ceb6683d5809ce848bee.tar.xz linux-454be2af5b49612e7f20ceb6683d5809ce848bee.zip | |
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>
| -rw-r--r-- | drivers/bus/arm-cci.c | 2 |
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)) |