diff options
| author | Michael Neuling | 2012-06-25 15:33:11 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2012-07-02 06:30:12 +0200 |
| commit | 2f584a146a2965b82fce89b8d2f95dc5cfe468d0 (patch) | |
| tree | 29683314e6f54a2b9c35b57e3dfcc92603d524f1 /arch/powerpc/kvm/book3s_hv_rmhandlers.S | |
| parent | powerpc/xmon: Use cpumask iterator to avoid warning (diff) | |
| download | kernel-qcow2-linux-2f584a146a2965b82fce89b8d2f95dc5cfe468d0.tar.gz kernel-qcow2-linux-2f584a146a2965b82fce89b8d2f95dc5cfe468d0.tar.xz kernel-qcow2-linux-2f584a146a2965b82fce89b8d2f95dc5cfe468d0.zip | |
powerpc/kvm: sldi should be sld
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>
CC: <stable@kernel.org> [v3.2+]
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_rmhandlers.S')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index a84aafce2a12..a1044f43becd 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -810,7 +810,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 */ |