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-2.6.39' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
perf_event_xscale.c
diff --git
a/arch/arm/kernel/perf_event_xscale.c
b/arch/arm/kernel/perf_event_xscale.c
index
28cd3b0
..
39affbe
100644
(file)
--- a/
arch/arm/kernel/perf_event_xscale.c
+++ b/
arch/arm/kernel/perf_event_xscale.c
@@
-246,7
+246,7
@@
xscale1pmu_handle_irq(int irq_num, void *dev)
continue;
hwc = &event->hw;
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;
data.period = event->hw.last_period;
if (!armpmu_event_set_period(event, hwc, idx))
continue;
@@
-578,7
+578,7
@@
xscale2pmu_handle_irq(int irq_num, void *dev)
continue;
hwc = &event->hw;
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;
data.period = event->hw.last_period;
if (!armpmu_event_set_period(event, hwc, idx))
continue;