Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/rric/oprofile into perf/urgent Pull a oprofile fix from Robert Richter. Signed-off-by: Ingo Molnar <mingo@kernel.org>
mariux64 · Jun 24, 2012 · 662f5ce · 662f5ce
2 parents 002b758 + e734568
commit 662f5ce
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
 
 /*