diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-24 19:08:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-24 19:08:49 +0200 |
| commit | 662f5cedb38c4b88e1cebfd54a88159f2f7ab7b9 (patch) | |
| tree | f94f8beef7165f728e3ff00b47f2ee2fee8fc2b3 /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
| parent | oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array (diff) | |
| download | linux-662f5cedb38c4b88e1cebfd54a88159f2f7ab7b9.tar.xz linux-662f5cedb38c4b88e1cebfd54a88159f2f7ab7b9.zip | |
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; 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; /* |