aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2019-06-13 13:52:30 +0000
committerMichael Ellerman <mpe@ellerman.id.au>2019-06-15 23:44:41 +1000
commite8732ffa2e096d433c3f2349b871d43ed0d39f5c (patch)
treee63d1c2944344153ea7195bc02c3be1368355c17
parentb7f8b440f3001cc1775c028f0a783786113c2ae3 (diff)
downloadtip-e8732ffa2e096d433c3f2349b871d43ed0d39f5c.tar.gz
tip-e8732ffa2e096d433c3f2349b871d43ed0d39f5c.tar.xz
tip-e8732ffa2e096d433c3f2349b871d43ed0d39f5c.zip
powerpc/booke: fix fast syscall entry on SMP
Use r10 instead of r9 to calculate CPU offset as r9 contains the value from SRR1 which is used later. Fixes: 1a4b739bbb4f ("powerpc/32: implement fast entry for syscalls on BOOKE") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/kernel/head_booke.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h
index bfeb469e8106..9f9e0d109d7d 100644
--- a/arch/powerpc/kernel/head_booke.h
+++ b/arch/powerpc/kernel/head_booke.h
@@ -145,9 +145,9 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV)
tophys(r11,r11)
addi r11,r11,global_dbcr0@l
#ifdef CONFIG_SMP
- lwz r9,TASK_CPU(r2)
- slwi r9,r9,3
- add r11,r11,r9
+ lwz r10, TASK_CPU(r2)
+ slwi r10, r10, 3
+ add r11, r11, r10
#endif
lwz r12,0(r11)
mtspr SPRN_DBCR0,r12