diff options
| author | Ingo Molnar | 2010-10-14 08:09:42 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2010-10-14 08:09:42 +0200 |
| commit | 1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0 (patch) | |
| tree | 7e6bc0e0785b11b38c828e062b2da3033e61cd35 /arch/arm/kernel/perf_event.c | |
| parent | Merge commit 'v2.6.36-rc7' into perf/core (diff) | |
| download | kernel-qcow2-linux-1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0.tar.gz kernel-qcow2-linux-1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0.tar.xz kernel-qcow2-linux-1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0.zip | |
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>
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
| -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) 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; } |