summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-29 10:29:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-29 10:29:21 -0700
commit62a75b99ad3595c8b92eb584dd61a93f5a0e8828 (patch)
treeaf76a1103af9b3ef56d3ee22365ca388cecee303 /drivers
parentefc9def8c7ab7ac8d44d8afb565247aa2b21cfd5 (diff)
parent662f5cedb38c4b88e1cebfd54a88159f2f7ab7b9 (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull oprofile fixlet from Ingo Molnar. * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array
Diffstat (limited to 'drivers')
-rw-r--r--drivers/oprofile/oprofile_perf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index da14432806c6..efc4b7f308cf 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;
/*