diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-10-14 02:09:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-14 02:09:42 -0400 |
commit | 1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0 (patch) | |
tree | 7e6bc0e0785b11b38c828e062b2da3033e61cd35 | |
parent | 7cd2541cf2395962daf98ec32a141aba3398a9b2 (diff) |
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>
-rw-r--r-- | 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 ad19c276b10f..55addc85eaa7 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) | |||
534 | event->destroy = hw_perf_event_destroy; | 534 | event->destroy = hw_perf_event_destroy; |
535 | 535 | ||
536 | if (!atomic_inc_not_zero(&active_events)) { | 536 | if (!atomic_inc_not_zero(&active_events)) { |
537 | if (atomic_read(&active_events) > armpmu.num_events) { | 537 | if (atomic_read(&active_events) > armpmu->num_events) { |
538 | atomic_dec(&active_events); | 538 | atomic_dec(&active_events); |
539 | return -ENOSPC; | 539 | return -ENOSPC; |
540 | } | 540 | } |