From: Christophe Leroy Date: Fri, 5 Aug 2016 11:28:05 +0000 (+0200) Subject: powerpc/40x: Clear MSR_DR in one insn instead of two X-Git-Tag: Ubuntu-5.2.0-15.16~6506^2~124 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=362957c27ed0d9ff485d3266ed22d944cbfea6cc;p=mirror_ubuntu-eoan-kernel.git powerpc/40x: Clear MSR_DR in one insn instead of two Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 84db14e435f5..3f7a9a2d2435 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -244,8 +244,7 @@ _GLOBAL(_nmask_and_or_msr) */ _GLOBAL(real_readb) mfmsr r7 - ori r0,r7,MSR_DR - xori r0,r0,MSR_DR + rlwinm r0,r7,0,~MSR_DR sync mtmsr r0 sync @@ -262,8 +261,7 @@ _GLOBAL(real_readb) */ _GLOBAL(real_writeb) mfmsr r7 - ori r0,r7,MSR_DR - xori r0,r0,MSR_DR + rlwinm r0,r7,0,~MSR_DR sync mtmsr r0 sync