* [PATCH] powerpc: Remove mtmsrd(), use existing mtmsr()
@ 2015-07-07 3:56 Anton Blanchard
2015-07-16 9:54 ` Michael Ellerman
0 siblings, 1 reply; 2+ messages in thread
From: Anton Blanchard @ 2015-07-07 3:56 UTC (permalink / raw)
To: benh, paulus, mpe, mikey, cyril.bur; +Cc: linuxppc-dev
mtmsr() does the right thing on 32bit and 64bit, so use it everywhere.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
arch/powerpc/include/asm/reg.h | 3 +--
arch/powerpc/oprofile/op_model_power4.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index af56b5c..bb27588 100644
--- 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 962fe7b..4b32e94 100644
--- 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)
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: powerpc: Remove mtmsrd(), use existing mtmsr()
2015-07-07 3:56 [PATCH] powerpc: Remove mtmsrd(), use existing mtmsr() Anton Blanchard
@ 2015-07-16 9:54 ` Michael Ellerman
0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2015-07-16 9:54 UTC (permalink / raw)
To: Anton Blanchard, benh, paulus, mikey, cyril.bur; +Cc: linuxppc-dev
On Tue, 2015-07-07 at 03:56:59 UTC, Anton Blanchard wrote:
> mtmsr() does the right thing on 32bit and 64bit, so use it everywhere.
>
> Signed-off-by: Anton Blanchard <anton@samba.org>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/1c53973172f84fafa8ad
cheers
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-16 9:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-07 3:56 [PATCH] powerpc: Remove mtmsrd(), use existing mtmsr() Anton Blanchard
2015-07-16 9:54 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).