projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7cd2541
)
perf, ARM: Fix sysfs bits removal build failure
author
Ingo Molnar
<
[email protected]
>
Thu, 14 Oct 2010 06:09:42 +0000
(08:09 +0200)
committer
Ingo Molnar
<
[email protected]
>
Thu, 14 Oct 2010 06:09:42 +0000
(08:09 +0200)
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 <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Cc: paulus <
[email protected]
>
LKML-Reference: <
20101014164925
.
4fa16b75
[email protected]
>
Signed-off-by: Ingo Molnar <
[email protected]
>
arch/arm/kernel/perf_event.c
patch
|
blob
|
history
diff --git
a/arch/arm/kernel/perf_event.c
b/arch/arm/kernel/perf_event.c
index ad19c276b10fa1b5d7f82a8f5c2169560d9ebdd0..55addc85eaa7f6706334f11cdb48207fc0f69ce5 100644
(file)
--- 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;
}