* [PATCH] arm: perf: Fix build break due to a typo
@ 2010-10-14 14:34 Anand Gadiyar
2010-10-14 16:23 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Anand Gadiyar @ 2010-10-14 14:34 UTC (permalink / raw)
To: linux-arm-kernel
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@ti.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: paulus <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Russell King <linux@arm.linux.org.uk>
---
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;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] arm: perf: Fix build break due to a typo
2010-10-14 14:34 [PATCH] arm: perf: Fix build break due to a typo Anand Gadiyar
@ 2010-10-14 16:23 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2010-10-14 16:23 UTC (permalink / raw)
To: linux-arm-kernel
* Anand Gadiyar <gadiyar@ti.com> wrote:
> 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.
Yeah - i already fixed it earlier today and pushed it out.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-14 16:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-14 14:34 [PATCH] arm: perf: Fix build break due to a typo Anand Gadiyar
2010-10-14 16:23 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).