moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/32: Avoid #ifdef nested with FTR_SECTION on booke syscall entry

Browse Source 
On booke, SYSCALL_ENTRY macro nests an FTR_SECTION with a #ifdef
CONFIG_KVM_BOOKE_HV.

Duplicate the single instruction alternative to avoid nesting.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/33db61d5f85146262dbe26648f8f87eca3cae393.1622818435.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy
2021-06-04 14:54:15 +00:00
committed by Michael Ellerman
parent 4bd9e05ac7
commit a27755d57e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/head_booke.h
View File

@@ -128,10 +128,10 @@ BEGIN_FTR_SECTION
mr r12, r13 mr r12, r13
lwz r13, THREAD_NORMSAVE(2)(r10) lwz r13, THREAD_NORMSAVE(2)(r10)
FTR_SECTION_ELSE FTR_SECTION_ELSE
#endif
mfcr r12 mfcr r12
#ifdef CONFIG_KVM_BOOKE_HV
ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV) ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV)
#else
mfcr r12
#endif #endif
mfspr r9, SPRN_SRR1 mfspr r9, SPRN_SRR1
BOOKE_CLEAR_BTB(r11) BOOKE_CLEAR_BTB(r11)