On 5/4/22 07:24, Nick Desaulniers wrote:

On Thu, Apr 28, 2022 at 11:46 PM Alexey Kardashevskiy [off-list ref] wrote:

quoted

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index b66dd6f775a4..5b783bd51260 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S

@@ -476,9 +476,11 @@ DEFINE_FIXED_SYMBOL(\name\()_common_real, text)
                 .if IHSRR_IF_HVMODE
                 BEGIN_FTR_SECTION
                 bne     masked_Hinterrupt
+               b       4f
                 FTR_SECTION_ELSE

Do you need to have the ELSE even if there's nothing in it; should it
have a nop?  The rest of the assembler changes LGTM, but withholding
RB tag until we have Kconfig dependencies in better shape.

The FTR patcher will add the necessary amount of "nop"s there and 
dropping "FTR_SECTION_ELSE" breaks the build as it does some 
"pushsection" magic.

quoted

-               bne     masked_interrupt
                 ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
+               bne     masked_interrupt
+4:
                 .elseif IHSRR
                 bne     masked_Hinterrupt
                 .else