3 files changed, 16 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index a0579e859b21..b25b25902d15 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -973,6 +973,13 @@ __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. */
@@ -1088,7 +1095,12 @@ 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
 
 /*
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 530f7dba0bd2..c5d179d4f818 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -492,7 +492,7 @@ int __devinit __cpu_up(unsigned int cpu)
          * -- Cort
          */
         if (system_state < SYSTEM_RUNNING)
-                for (c = 5000; c && !cpu_callin_map[cpu]; c--)
+                for (c = 50000; c && !cpu_callin_map[cpu]; c--)
                         udelay(100);
 #ifdef CONFIG_HOTPLUG_CPU
         else
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index ab5cd724b122..2ed43a493b31 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -43,13 +43,13 @@ unsigned long _SDR1;
 union ubat {                    /* BAT register values to be loaded */
         BAT     bat;
         u32     word[2];
-} BATS[4][2];                   /* 4 pairs of IBAT, DBAT */
+} BATS[8][2];                   /* 8 pairs of IBAT, DBAT */
 
 struct batrange {               /* stores address ranges mapped by BATs */
         unsigned long start;
         unsigned long limit;
         unsigned long phys;
-} bat_addrs[4];
+} bat_addrs[8];
 
 /*
  * Return PA for this VA if it is mapped by a BAT, or 0