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>
This commit is contained in:
Родитель
e8a4fd0afe
Коммит
1c53973172
|
@ -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)) \
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче