linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drivers: CCI: fix used_mask init in validate_group()
@ 2015-04-08 18:21 Mark Salter
  2015-04-09 11:06 ` Suzuki K. Poulose
  2015-04-09 13:51 ` Mark Rutland
  0 siblings, 2 replies; 20+ messages in thread
From: Mark Salter @ 2015-04-08 18:21 UTC (permalink / raw)
  To: linux-arm-kernel

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.
This patch changes the used_mask initialization to be runtime
based on the actual size of the array.

Signed-off-by: Mark Salter <msalter@redhat.com>
---
 drivers/bus/arm-cci.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 84fd660..1d83072 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -679,13 +679,13 @@ static int
 validate_group(struct perf_event *event)
 {
 	struct perf_event *sibling, *leader = event->group_leader;
-	struct cci_pmu_hw_events fake_pmu = {
-		/*
-		 * Initialise the fake PMU. We only need to populate the
-		 * used_mask for the purposes of validation.
-		 */
-		.used_mask = CPU_BITS_NONE,
-	};
+	struct cci_pmu_hw_events fake_pmu;
+
+	/*
+	 * Initialise the fake PMU. We only need to populate the
+	 * used_mask for the purposes of validation.
+	 */
+	memset(fake_pmu.used_mask, 0, sizeof(fake_pmu.used_mask));
 
 	if (!validate_event(&fake_pmu, leader))
 		return -EINVAL;
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2015-04-30 14:52 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-08 18:21 [PATCH] drivers: CCI: fix used_mask init in validate_group() Mark Salter
2015-04-09 11:06 ` Suzuki K. Poulose
2015-04-09 13:51 ` Mark Rutland
2015-04-09 14:11   ` Mark Salter
2015-04-09 14:20     ` Mark Rutland
2015-04-09 14:26       ` Mark Salter
2015-04-09 14:40         ` Mark Rutland
2015-04-09 14:57           ` [PATCH V2] " Mark Salter
2015-04-09 15:36             ` Mark Rutland
2015-04-13 12:41               ` Will Deacon
2015-04-30 10:55                 ` Suzuki K. Poulose
2015-04-30 13:26                   ` Mark Salter
2015-04-30 13:33                     ` Mark Rutland
2015-04-30 14:03                       ` Mark Salter
2015-04-30 14:38                         ` Mark Rutland
2015-04-30 14:46                           ` Mark Salter
2015-04-30 14:52                             ` Arnd Bergmann
2015-04-15 10:44             ` Suzuki K. Poulose
2015-04-15 11:58               ` Will Deacon
2015-04-15 12:50                 ` Suzuki K. Poulose

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).