From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760181Ab2FHPQM (ORCPT ); Fri, 8 Jun 2012 11:16:12 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:42586 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753336Ab2FHPQK (ORCPT ); Fri, 8 Jun 2012 11:16:10 -0400 From: Will Deacon To: linux-kernel@vger.kernel.org Cc: Will Deacon , Matt Fleming , Robert Richter Subject: [PATCH] oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array Date: Fri, 8 Jun 2012 16:16:04 +0100 Message-Id: <1339168564-30008-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The OProfile perf backend uses a static array to keep track of the perf events on the system. When compiling with CONFIG_CPUMASK_OFFSTACK=y && SMP, nr_cpumask_bits is not a compile-time constant and the build will fail with: oprofile_perf.c:28: error: variably modified 'perf_events' at file scope This patch uses NR_CPUs instead of nr_cpumask_bits for the array initialisation. If this causes space problems in the future, we can always move to dynamic allocation for the events array. Cc: Matt Fleming Cc: Robert Richter Reported-by: Russell King - ARM Linux Signed-off-by: Will Deacon --- drivers/oprofile/oprofile_perf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c index da14432..efc4b7f 100644 --- a/drivers/oprofile/oprofile_perf.c +++ b/drivers/oprofile/oprofile_perf.c @@ -25,7 +25,7 @@ static int oprofile_perf_enabled; static DEFINE_MUTEX(oprofile_perf_mutex); static struct op_counter_config *counter_config; -static struct perf_event **perf_events[nr_cpumask_bits]; +static struct perf_event **perf_events[NR_CPUS]; static int num_counters; /* -- 1.7.4.1