Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent

Pull a oprofile fix from Robert Richter.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2012-06-24 19:08:49 +02:00
commit 662f5cedb3
1 changed files with 1 additions and 1 deletions

View File

@ -25,7 +25,7 @@ static int oprofile_perf_enabled;
static DEFINE_MUTEX(oprofile_perf_mutex); static DEFINE_MUTEX(oprofile_perf_mutex);
static struct op_counter_config *counter_config; 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; static int num_counters;
/* /*