linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / kernel / head_32.S

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index d88e182..a0579e8 100644 (file)
--- 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
 
 /*