[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <55265D1E.8050700@arm.com>
Date: Thu, 09 Apr 2015 12:06:06 +0100
From: "Suzuki K. Poulose" <Suzuki.Poulose@....com>
To: Mark Salter <msalter@...hat.com>, Will Deacon <Will.Deacon@....com>
CC: Mark Rutland <Mark.Rutland@....com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH] drivers: CCI: fix used_mask init in validate_group()
On 08/04/15 19:21, Mark Salter wrote:
> 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@...hat.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));
The patch looks good to me.
Reviewed-by: Suzuki K. Poulose <suzuki.poulose@....com>
Suzuki
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists