From: tip-bot for Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, paulus@samba.org, hpa@zytor.com,
mingo@redhat.com, a.p.zijlstra@chello.nl, tglx@linutronix.de,
sfr@canb.auug.org.au, mingo@elte.hu
Subject: [tip:perf/core] perf, ARM: Fix sysfs bits removal build failure
Date: Thu, 14 Oct 2010 06:34:49 GMT [thread overview]
Message-ID: <tip-1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0@git.kernel.org> (raw)
In-Reply-To: <20101014164925.4fa16b75.sfr@canb.auug.org.au>
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;
}
prev parent reply other threads:[~2010-10-14 6:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-14 5:49 linux-next: build failure after merge of the final tree (tip tree related) Stephen Rothwell
2010-10-14 6:31 ` Ingo Molnar
2010-10-14 6:34 ` tip-bot for Ingo Molnar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-1efeb08d7dd32c0fbd4b784ea9303b53d345bfd0@git.kernel.org \
--to=mingo@elte.hu \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome