linux-next: build failure after merge of the final tree (tip tree related)

linux-next: build failure after merge of the final tree (tip tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 585 bytes --]

Hi all,

After merging the final tree, linux-next builds (arm corgi_defconfig,
spitz_defconfig) fail like this:

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

Caused by commit 15ac9a395a753cb28c674e7ea80386ffdff21785 ("perf: Remove
the sysfs bits").

This seems to have broken in next-20100913 and noone has noticed/bothered
to fix it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (tip tree related)

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> After merging the final tree, linux-next builds (arm corgi_defconfig,
> spitz_defconfig) fail like this:
> 
> 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
> 
> Caused by commit 15ac9a395a753cb28c674e7ea80386ffdff21785 ("perf: Remove
> the sysfs bits").

Thanks, fixed.

> This seems to have broken in next-20100913 and noone has noticed/bothered
> to fix it.

What appears to have happened is the following: the build bug depends on 
CONFIG_HW_PERF_EVENTS=y, which is off by default on ARM (which default 
to a v5 CPU type - while hw pmu support is for v6+ cpus).

So the regular ARM defconfig built fine both in -next and here in the 
latest perf/core tree:

  testing        arm:  -git:  pass (    0),  -tip:  pass (    4)

Some new change in linux-next appears to have turned on HW_PERF_EVENTS 
elsewhere which you thus tested for the first time - which triggered the 
build bug.

Thanks,

	Ingo

[tip:perf/core] perf, ARM: Fix sysfs bits removal build failure

[tip-bot for Ingo Molnar]

Commit-ID:  1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0
Gitweb:     http://git.kernel.org/tip/1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0
Author:     Ingo Molnar <mingo@elte.hu>
AuthorDate: Thu, 14 Oct 2010 08:09:42 +0200
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 14 Oct 2010 08:09:42 +0200

perf, ARM: Fix sysfs bits removal build failure

Fix this linux-next build failure that Stephen reported:

 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

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: paulus <paulus@samba.org>
LKML-Reference: <20101014164925.4fa16b75.sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/arm/kernel/perf_event.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index ad19c27..55addc8 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -534,7 +534,7 @@ static int armpmu_event_init(struct perf_event *event)
 	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;
 		}