Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / arch / mips / kernel / perf_event.c

diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c
index ff1840f..0aee944 100644 (file)
--- a/arch/mips/kernel/perf_event.c
+++ b/arch/mips/kernel/perf_event.c
@@ -525,7 +525,7 @@ handle_associated_event(struct cpu_hw_events *cpuc,
        if (!mipspmu_event_set_period(event, hwc, idx))
                return;
 
        if (!mipspmu_event_set_period(event, hwc, idx))
                return;
 

-       if (perf_event_overflow(event, 0, data, regs))
+       if (perf_event_overflow(event, data, regs))

                mipspmu->disable_event(idx);
 }
 
                mipspmu->disable_event(idx);
 }