diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-24 13:08:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-24 13:08:49 -0400 |
| commit | 662f5cedb38c4b88e1cebfd54a88159f2f7ab7b9 (patch) | |
| tree | f94f8beef7165f728e3ff00b47f2ee2fee8fc2b3 /drivers | |
| parent | 002b758b6dc4d840e662f25625f696d7b43d48f4 (diff) | |
| parent | e734568b675c985db2026848fefaac01c22977a5 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/oprofile/oprofile_perf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c index da14432806c6..efc4b7f308cf 100644 --- a/drivers/oprofile/oprofile_perf.c +++ b/drivers/oprofile/oprofile_perf.c | |||
| @@ -25,7 +25,7 @@ static int oprofile_perf_enabled; | |||
| 25 | static DEFINE_MUTEX(oprofile_perf_mutex); | 25 | static DEFINE_MUTEX(oprofile_perf_mutex); |
| 26 | 26 | ||
| 27 | static struct op_counter_config *counter_config; | 27 | static struct op_counter_config *counter_config; |
| 28 | static struct perf_event **perf_events[nr_cpumask_bits]; | 28 | static struct perf_event **perf_events[NR_CPUS]; |
| 29 | static int num_counters; | 29 | static int num_counters; |
| 30 | 30 | ||
| 31 | /* | 31 | /* |