diff options
| author | Olof Johansson <olof@lixom.net> | 2007-09-05 04:42:30 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 17:33:22 +0200 |
| commit | a416561bf790d55db68b2980c2a6951981018041 (patch) | |
| tree | fe57391e4d67961cd0682344b5276a4153e160c4 | |
| parent | [POWERPC] Remove unused platform_machine_check() (diff) | |
| download | linux-a416561bf790d55db68b2980c2a6951981018041.tar.xz linux-a416561bf790d55db68b2980c2a6951981018041.zip | |
[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>
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/exception.h | 2 |
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 |