projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.5-rc7' into late/soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
kvm
/
book3s_hv_rmhandlers.S
diff --git
a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index a84aafce2a129e311a0943be0975db3823b88402..a1044f43becd380cdc7216e082fbf267b97a3fae 100644
(file)
--- 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
- sld
i
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 */