On 06.10.10 14:14:10, Robert Richter wrote: > On 04.10.10 16:44:19, Matt Fleming wrote: > > The number of counters for the registered pmu is needed in a few places > > so provide a helper function that returns this number. > > > > Signed-off-by: Matt Fleming <matt@xxxxxxxxxxxxxxxxx> > > Tested-by: Will Deacon <will.deacon@xxxxxxx> > > --- > > arch/arm/kernel/perf_event.c | 6 ++++++ > > arch/arm/oprofile/common.c | 31 ++++++++++++++++++------------- > > arch/sh/kernel/perf_event.c | 9 +++++++++ > > include/linux/perf_event.h | 1 + > > 4 files changed, 34 insertions(+), 13 deletions(-) > > diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c > > index d660cb8..23f18a0 100644 > > --- a/arch/arm/oprofile/common.c > > +++ b/arch/arm/oprofile/common.c > > @@ -43,7 +43,7 @@ static DEFINE_MUTEX(op_arm_mutex); > > > > static struct op_counter_config *counter_config; > > static struct perf_event **perf_events[nr_cpumask_bits]; > > -static int perf_num_counters; > > +static int perf_nr_counters; Matt, as we will have one more version with this patch set, please use num_counters instead of perf_nr_counters. The same name is used also for x86. Thanks, -Robert > > > > /* > > * Overflow callback for oprofile. -- Advanced Micro Devices, Inc. Operating System Research Center -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html