Merge tag 'v4.4.60' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / perf / power5+-pmu.c

diff --git a/arch/powerpc/perf/power5+-pmu.c b/arch/powerpc/perf/power5+-pmu.c
index b03b6dc0172d8c2cf3a0c91713edddbb34be2a7c..0526dac66007fee536d5e831ba6bdc7ad079cdc4 100644 (file)
--- a/arch/powerpc/perf/power5+-pmu.c
+++ b/arch/powerpc/perf/power5+-pmu.c
@@ -452,7 +452,7 @@ static int power5p_marked_instr_event(u64 event)
 }
 
 static int power5p_compute_mmcr(u64 event[], int n_ev,
-                               unsigned int hwc[], unsigned long mmcr[])
+                               unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])
 {
        unsigned long mmcr1 = 0;
        unsigned long mmcra = 0;