2 files changed, 4 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 33c4e8cab0ba..cec59089e48c 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -656,7 +656,9 @@ hardware_interrupt_common:
         FINISH_NAP
 hardware_interrupt_entry:
         DISABLE_INTS
+BEGIN_FTR_SECTION
         bl      .ppc64_runlatch_on
+END_FTR_SECTION_IFSET(CPU_FTR_CTRL)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      .do_IRQ
         b       .ret_from_except_lite
diff --git a/include/asm-powerpc/exception.h b/include/asm-powerpc/exception.h
index d850c8ea5903..39abdb02fdef 100644
--- a/include/asm-powerpc/exception.h
+++ b/include/asm-powerpc/exception.h
@@ -282,7 +282,9 @@ label##_common:						\
         EXCEPTION_PROLOG_COMMON(trap, PACA_EXGEN);      \
         FINISH_NAP;                                     \
         DISABLE_INTS;                                   \
+BEGIN_FTR_SECTION                                       \
         bl      .ppc64_runlatch_on;                     \
+END_FTR_SECTION_IFSET(CPU_FTR_CTRL)                     \
         addi    r3,r1,STACK_FRAME_OVERHEAD;             \
         bl      hdlr;                                   \
         b       .ret_from_except_lite