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 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
perf_event.c
diff --git
a/arch/alpha/kernel/perf_event.c
b/arch/alpha/kernel/perf_event.c
index
90561c4
..
8e47709
100644
(file)
--- a/
arch/alpha/kernel/perf_event.c
+++ b/
arch/alpha/kernel/perf_event.c
@@
-847,7
+847,7
@@
static void alpha_perf_event_irq_handler(unsigned long la_ptr,
data.period = event->hw.last_period;
if (alpha_perf_event_set_period(event, hwc, idx)) {
data.period = event->hw.last_period;
if (alpha_perf_event_set_period(event, hwc, idx)) {
- if (perf_event_overflow(event,
1,
&data, regs)) {
+ if (perf_event_overflow(event, &data, regs)) {
/* Interrupts coming too quickly; "throttle" the
* counter, i.e., disable it for a little while.
*/
/* Interrupts coming too quickly; "throttle" the
* counter, i.e., disable it for a little while.
*/