[POWERPC] Oprofile cleanup

Clean up the ctr_read/write a bit. It's currently defined in the
include but only used in one C file each. The only exception is the
classic version, so keep that in the include and define in the C file
as appropriate.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 356709d515b9..fe597a154d4f 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -121,9 +121,9 @@ static void power4_start(struct op_counter_config *ctr)
 
         for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
                 if (ctr[i].enabled) {
-                        ctr_write(i, reset_value[i]);
+                        classic_ctr_write(i, reset_value[i]);
                 } else {
-                        ctr_write(i, 0);
+                        classic_ctr_write(i, 0);
                 }
         }
 
@@ -254,13 +254,13 @@ static void power4_handle_interrupt(struct pt_regs *regs,
         mtmsrd(mfmsr() | MSR_PMM);
 
         for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
-                val = ctr_read(i);
+                val = classic_ctr_read(i);
                 if (val < 0) {
                         if (oprofile_running && ctr[i].enabled) {
                                 oprofile_add_ext_sample(pc, regs, i, is_kernel);
-                                ctr_write(i, reset_value[i]);
+                                classic_ctr_write(i, reset_value[i]);
                         } else {
-                                ctr_write(i, 0);
+                                classic_ctr_write(i, 0);
                         }
                 }
         }