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: Ingo Molnar <mingo@kernel.org>

parents 002b758b e734568b

drivers/oprofile/oprofile_perf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

		/*