]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
powerpc/kvm: sldi should be sld
authorMichael Neuling <mikey@neuling.org>
Mon, 25 Jun 2012 13:33:11 +0000 (13:33 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 12 Jul 2012 03:32:04 +0000 (04:32 +0100)
commit 2f584a146a2965b82fce89b8d2f95dc5cfe468d0 upstream.

Since we are taking a registers, this should never have been an sldi.
Talking to paulus offline, this is the correct fix.

Was introduced by:
 commit 19ccb76a1938ab364a412253daec64613acbf3df
 Author: Paul Mackerras <paulus@samba.org>
 Date:   Sat Jul 23 17:42:46 2011 +1000

Talking to paulus, this shouldn't be a literal.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/powerpc/kvm/book3s_hv_rmhandlers.S

index 44d8829334ab2d9c1ec22606336177d36f41b3d5..5e8dc082a2eb49cc1d3d9e5c39fb827ffa3a06d0 100644 (file)
@@ -763,7 +763,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_201)
        lwz     r3,VCORE_NAPPING_THREADS(r5)
        lwz     r4,VCPU_PTID(r9)
        li      r0,1
-       sldi    r0,r0,r4
+       sld     r0,r0,r4
        andc.   r3,r3,r0                /* no sense IPI'ing ourselves */
        beq     43f
        mulli   r4,r4,PACA_SIZE         /* get paca for thread 0 */