]> git.karo-electronics.de Git - karo-tx-linux.git/commit
oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array
authorWill Deacon <will.deacon@arm.com>
Fri, 8 Jun 2012 15:16:04 +0000 (16:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 16:04:21 +0000 (09:04 -0700)
commita92fdd54f75eae8e7d591070c83e146ab8eec2e3
tree46180f32936d950b933503caa61fcb76d2a31c4d
parenta71e15c90f58beb7a7f8df6ab7d46fb7c4ca618b
oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array

commit e734568b675c985db2026848fefaac01c22977a5 upstream.

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 <matt@console-pimps.org>
Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/oprofile/oprofile_perf.c