projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc1d770
)
powerpc/kvm: sldi should be sld
author
Michael Neuling
<
[email protected]
>
Mon, 25 Jun 2012 13:33:11 +0000
(13:33 +0000)
committer
Benjamin Herrenschmidt
<
[email protected]
>
Mon, 2 Jul 2012 04:30:12 +0000
(14:30 +1000)
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 <
[email protected]
>
Date: Sat Jul 23 17:42:46 2011 +1000
Talking to paulus, this shouldn't be a literal.
Signed-off-by: Michael Neuling <
[email protected]
>
CC: <
[email protected]
> [v3.2+]
Signed-off-by: Benjamin Herrenschmidt <
[email protected]
>
arch/powerpc/kvm/book3s_hv_rmhandlers.S
patch
|
blob
|
history
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 */