Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / oprofile / op_model_power4.c

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)