X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fkernel%2Fhead_32.S;fp=arch%2Fpowerpc%2Fkernel%2Fhead_32.S;h=a0579e859b212e1a6e6734f0ac5b1f1cdc789bdc;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=d88e182e40b3849ba085ec3f83265adac690e538;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index d88e182e4..a0579e859 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -22,6 +22,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <asm/reg.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
@@ -972,13 +973,6 @@ __secondary_start_gemini:
         b       __secondary_start
 #endif /* CONFIG_GEMINI */
 
-	.globl __secondary_start_mpc86xx
-__secondary_start_mpc86xx:
-	mfspr	r3, SPRN_PIR
-	stw	r3, __secondary_hold_acknowledge@l(0)
-	mr	r24, r3			/* cpu # */
-	b	__secondary_start
-
 	.globl	__secondary_start_pmac_0
 __secondary_start_pmac_0:
 	/* NB the entries for cpus 0, 1, 2 must each occupy 8 bytes. */
@@ -1094,12 +1088,7 @@ load_up_mmu:
 	LOAD_BAT(1,r3,r4,r5)
 	LOAD_BAT(2,r3,r4,r5)
 	LOAD_BAT(3,r3,r4,r5)
-BEGIN_FTR_SECTION
-	LOAD_BAT(4,r3,r4,r5)
-	LOAD_BAT(5,r3,r4,r5)
-	LOAD_BAT(6,r3,r4,r5)
-	LOAD_BAT(7,r3,r4,r5)
-END_FTR_SECTION_IFSET(CPU_FTR_HAS_HIGH_BATS)
+
 	blr
 
 /*