powerpc: Move lowlevel runlatch calls under cpu feature control

PATCH New Olof Johansson 1 participant 1 message Sep 5, 2007 PowerPC

lore

Share & tools

lore

Olof Johansson

author

2007-09-05 03:35 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

arch/powerpc/kernel/head_64.S +2 -0

index 33c4e8c..cec5908 100644
@@ -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

include/asm-powerpc/exception.h +2 -0

index d850c8e..39abdb0 100644
@@ -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