[POWERPC] Move lowlevel runlatch calls under cpu feature control

There's no need to call the runlatch on functions on processors that
don't implement them (CPU_FTR_CTRL).

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 33c4e8cab0ba935b9fcdb2acdd42c1fd2f0d55b5..cec59089e48c056320a2fcffd35a4e5b7d66da78 100644 (file)
--- 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 d850c8ea59039fc4ffe68b611868abcfec4c3147..39abdb02fdefa1485acc2f543327eb5bc57803ed 100644 (file)
--- 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