Commit 62a75b99 authored Jun 29, 2012 by Linus Torvalds

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

parents efc9def8 662f5ced

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;

		/*