git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
perf_event_v6.c
diff --git
a/arch/arm/kernel/perf_event_v6.c
b/arch/arm/kernel/perf_event_v6.c
index
6fc2d22
..
f1e8dd9
100644
(file)
--- a/
arch/arm/kernel/perf_event_v6.c
+++ b/
arch/arm/kernel/perf_event_v6.c
@@
-474,7
+474,7
@@
armv6pmu_handle_irq(int irq_num,
continue;
hwc = &event->hw;
- armpmu_event_update(event, hwc, idx);
+ armpmu_event_update(event, hwc, idx
, 1
);
data.period = event->hw.last_period;
if (!armpmu_event_set_period(event, hwc, idx))
continue;