Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-drm-fsl-dcu.git] / arch / powerpc / oprofile / op_model_rs64.c

diff --git a/arch/powerpc/oprofile/op_model_rs64.c b/arch/powerpc/oprofile/op_model_rs64.c
index e010b85996e87d7f08db8d991e055ab2be6b3eae..c731acbfb2a5f6deb431a5f89bec06401fb081f6 100644 (file)
--- a/arch/powerpc/oprofile/op_model_rs64.c
+++ b/arch/powerpc/oprofile/op_model_rs64.c
@@ -102,7 +102,7 @@ static void rs64_reg_setup(struct op_counter_config *ctr,
        /* XXX setup user and kernel profiling */
 }
 
-static void rs64_cpu_setup(void *unused)
+static void rs64_cpu_setup(struct op_counter_config *ctr)
 {
        unsigned int mmcr0;
 
@@ -137,10 +137,10 @@ static void rs64_start(struct op_counter_config *ctr)
 
        for (i = 0; i < num_counters; ++i) {
                if (ctr[i].enabled) {
-                       ctr_write(i, reset_value[i]);
+                       classic_ctr_write(i, reset_value[i]);
                        ctrl_write(i, ctr[i].event);
                } else {
-                       ctr_write(i, 0);
+                       classic_ctr_write(i, 0);
                }
        }
 
@@ -175,22 +175,24 @@ static void rs64_handle_interrupt(struct pt_regs *regs,
                                  struct op_counter_config *ctr)
 {
        unsigned int mmcr0;
+       int is_kernel;
        int val;
        int i;
        unsigned long pc = mfspr(SPRN_SIAR);
-       int is_kernel = (pc >= KERNELBASE);
+
+       is_kernel = is_kernel_addr(pc);
 
        /* set the PMM bit (see comment below) */
        mtmsrd(mfmsr() | MSR_PMM);
 
        for (i = 0; i < num_counters; ++i) {
-               val = ctr_read(i);
+               val = classic_ctr_read(i);
                if (val < 0) {
                        if (ctr[i].enabled) {
-                               oprofile_add_pc(pc, is_kernel, i);
-                               ctr_write(i, reset_value[i]);
+                               oprofile_add_ext_sample(pc, regs, i, is_kernel);
+                               classic_ctr_write(i, reset_value[i]);
                        } else {
-                               ctr_write(i, 0);
+                               classic_ctr_write(i, 0);
                        }
                }
        }