Re: [PATCH 4/4] powerpc/32: Avoid #ifdef nested with FTR_SECTION on booke syscall entry
Le 04/06/2021 à 19:02, Andreas Schwab a écrit : On Jun 04 2021, Christophe Leroy wrote: On booke, SYSCALL_ENTRY macro nests an FTR_SECTION with a That sentence lacks an Argh ! It was . FTR_SECTION with a #ifdef CONFIG_KVM_BOOKE_HV. And git discarded the line starting with a # Christophe
Re: [PATCH 4/4] powerpc/32: Avoid #ifdef nested with FTR_SECTION on booke syscall entry
On Jun 04 2021, Christophe Leroy wrote: > On booke, SYSCALL_ENTRY macro nests an FTR_SECTION with a That sentence lacks an Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different."
[PATCH 4/4] powerpc/32: Avoid #ifdef nested with FTR_SECTION on booke syscall entry
On booke, SYSCALL_ENTRY macro nests an FTR_SECTION with a Duplicate the single instruction alternative to avoid nesting. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_booke.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h index 10f31146b472..87b806e8eded 100644 --- a/arch/powerpc/kernel/head_booke.h +++ b/arch/powerpc/kernel/head_booke.h @@ -128,10 +128,10 @@ BEGIN_FTR_SECTION mr r12, r13 lwz r13, THREAD_NORMSAVE(2)(r10) FTR_SECTION_ELSE -#endif mfcrr12 -#ifdef CONFIG_KVM_BOOKE_HV ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV) +#else + mfcrr12 #endif mfspr r9, SPRN_SRR1 BOOKE_CLEAR_BTB(r11) -- 2.25.0
