armpmu is a pointer to a structure - We need to use the structure pointer operator to access num_events, and not the structure member operator. This fixes the following build break when building for OMAP4. CC arch/arm/kernel/perf_event.o arch/arm/kernel/perf_event.c: In function 'armpmu_event_init': arch/arm/kernel/perf_event.c:543: error: request for member 'num_events' in something not a structure or union make[1]: *** [arch/arm/kernel/perf_event.o] Error 1 make: *** [arch/arm/kernel] Error 2 Signed-off-by: Anand Gadiyar <gadiyar@xxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: paulus <paulus@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> --- This break is reproducible on linux-next as of 20101014. This was introduced in commit 15ac9a395a75 in linux-next <http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commitdiff;h=15ac9a395a753cb28c674e7ea80386ffdff21785> Strangely, I did not catch it with a standard omap2plus_defconfig build, but it showed up when I build a custom OMAP4-only config. I've saved the defconfig for later analysis. arch/arm/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: mainline/arch/arm/kernel/perf_event.c =================================================================== --- mainline.orig/arch/arm/kernel/perf_event.c +++ mainline/arch/arm/kernel/perf_event.c @@ -540,7 +540,7 @@ static int armpmu_event_init(struct perf event->destroy = hw_perf_event_destroy; if (!atomic_inc_not_zero(&active_events)) { - if (atomic_read(&active_events) > armpmu.num_events) { + if (atomic_read(&active_events) > armpmu->num_events) { atomic_dec(&active_events); return -ENOSPC; } -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
