powerpc: Remove mtmsrd(), use existing mtmsr()

mtmsr() does the right thing on 32bit and 64bit, so use it everywhere.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index af56b5c6c81ab18aefe24b16c810a3b89604434d..bb2758819bc92ee5f4896ab29c96955cc6a862bc 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -1193,8 +1193,7 @@
 #ifdef CONFIG_PPC_BOOK3S_64
 #define __mtmsrd(v, l) asm volatile("mtmsrd %0," __stringify(l) \
                                     : : "r" (v) : "memory")
-#define mtmsrd(v)      __mtmsrd((v), 0)
-#define mtmsr(v)       mtmsrd(v)
+#define mtmsr(v)       __mtmsrd((v), 0)
 #else
 #define mtmsr(v)       asm volatile("mtmsr %0" : \
                                     : "r" ((unsigned long)(v)) \

diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 962fe7b3e3fb1924543634b10593914257e30b39..4b32e9404bbef60acb1639cfe613dff51543bcec 100644 (file)
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -207,7 +207,7 @@ static int power4_start(struct op_counter_config *ctr)
        unsigned int mmcr0;
 
        /* set the PMM bit (see comment below) */
-       mtmsrd(mfmsr() | MSR_PMM);
+       mtmsr(mfmsr() | MSR_PMM);
 
        for (i = 0; i < cur_cpu_spec->num_pmcs; ++i) {
                if (ctr[i].enabled) {
@@ -377,7 +377,7 @@ static void power4_handle_interrupt(struct pt_regs *regs,
        is_kernel = get_kernel(pc, mmcra);
 
        /* set the PMM bit (see comment below) */
-       mtmsrd(mfmsr() | MSR_PMM);
+       mtmsr(mfmsr() | MSR_PMM);
 
        /* Check that the SIAR  valid bit in MMCRA is set to 1. */
        if ((mmcra & MMCRA_SIAR_VALID_MASK) == MMCRA_SIAR_VALID_MASK)