1 files changed, 18 insertions, 12 deletions

diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index 10f0aadee95b..efeb88184182 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -7,7 +7,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 
-#include <linux/threads.h>
+#include <linux/smp.h>
 #include <linux/module.h>
 #include <linux/memblock.h>
 
@@ -156,18 +156,29 @@ void __init initialise_paca(struct paca_struct *new_paca, int cpu)
 /* Put the paca pointer into r13 and SPRG_PACA */
 void setup_paca(struct paca_struct *new_paca)
 {
+        /* Setup r13 */
         local_paca = new_paca;
-        mtspr(SPRN_SPRG_PACA, local_paca);
+
 #ifdef CONFIG_PPC_BOOK3E
+        /* On Book3E, initialize the TLB miss exception frames */
         mtspr(SPRN_SPRG_TLB_EXFRAME, local_paca->extlb);
+#else
+        /* In HV mode, we setup both HPACA and PACA to avoid problems
+         * if we do a GET_PACA() before the feature fixups have been
+         * applied
+         */
+        if (cpu_has_feature(CPU_FTR_HVMODE_206))
+                mtspr(SPRN_SPRG_HPACA, local_paca);
 #endif
+        mtspr(SPRN_SPRG_PACA, local_paca);
+
 }
 
 static int __initdata paca_size;
 
 void __init allocate_pacas(void)
 {
-        int nr_cpus, cpu, limit;
+        int cpu, limit;
 
         /*
          * We can't take SLB misses on the paca, and we want to access them
@@ -179,23 +190,18 @@ void __init allocate_pacas(void)
         if (firmware_has_feature(FW_FEATURE_ISERIES))
                 limit = min(limit, HvPagesToMap * HVPAGESIZE);
 
-        nr_cpus = NR_CPUS;
-        /* On iSeries we know we can never have more than 64 cpus */
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                nr_cpus = min(64, nr_cpus);
-
-        paca_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpus);
+        paca_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpu_ids);
 
         paca = __va(memblock_alloc_base(paca_size, PAGE_SIZE, limit));
         memset(paca, 0, paca_size);
 
         printk(KERN_DEBUG "Allocated %u bytes for %d pacas at %p\n",
-                paca_size, nr_cpus, paca);
+                paca_size, nr_cpu_ids, paca);
 
-        allocate_lppacas(nr_cpus, limit);
+        allocate_lppacas(nr_cpu_ids, limit);
 
         /* Can't use for_each_*_cpu, as they aren't functional yet */
-        for (cpu = 0; cpu < nr_cpus; cpu++)
+        for (cpu = 0; cpu < nr_cpu_ids; cpu++)
                 initialise_paca(&paca[cpu], cpu);
 }