From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755634AbbDIO5m (ORCPT ); Thu, 9 Apr 2015 10:57:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47370 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753849AbbDIO5l (ORCPT ); Thu, 9 Apr 2015 10:57:41 -0400 From: Mark Salter To: Will Deacon Cc: Mark Rutland , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Salter Subject: [PATCH V2] drivers: CCI: fix used_mask init in validate_group() Date: Thu, 9 Apr 2015 10:57:05 -0400 Message-Id: <1428591425-17330-1-git-send-email-msalter@redhat.com> In-Reply-To: <20150409144029.GE9648@leverpostej> References: <20150409144029.GE9648@leverpostej> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Mark Salter --- drivers/bus/arm-cci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 84fd660..759e41c 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -684,7 +684,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(&fake_pmu, leader)) -- 1.8.3.1