Commit 662f5ced authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'urgent' of...

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: default avatarIngo Molnar <mingo@kernel.org>
parents 002b758b e734568b
...@@ -25,7 +25,7 @@ static int oprofile_perf_enabled; ...@@ -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;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment