Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fixes for the SLB shadow buffer code
  [POWERPC] Fix a compile warning in powermac/feature.c
  [POWERPC] Fix a compile warning in pci_32.c
  [POWERPC] Fix parse_drconf_memory() for 64-bit start addresses
  [POWERPC] Fix num_cpus calculation in smp_call_function_map()
  [POWERPC] ps3: Fix section mismatch in ps3/setup.c
  [POWERPC] spufs: Fix affinity after introduction of node_allowed() calls
  [POWERPC] Fix special PTE code for secondary hash bucket
  [POWERPC] Expand RPN field to 34 bits when using 64k pages

3 files changed, 10 insertions, 7 deletions

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 9ef28da2c7fe..952eba6701f4 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -389,8 +389,11 @@ BEGIN_FTR_SECTION
         ld      r9,PACA_SLBSHADOWPTR(r13)
         li      r12,0
         std     r12,SLBSHADOW_STACKESID(r9) /* Clear ESID */
+        eieio
         std     r7,SLBSHADOW_STACKVSID(r9)  /* Save VSID */
+        eieio
         std     r0,SLBSHADOW_STACKESID(r9)  /* Save ESID */
+        eieio
 
         slbie   r6
         slbie   r6              /* Workaround POWER5 < DD2.1 issue */
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index cd35c969bb28..04a3109ae3c6 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -581,8 +581,11 @@ pcibios_assign_resources(void)
                         if ((r->flags & IORESOURCE_UNSET) && r->end &&
                             (!ppc_md.pcibios_enable_device_hook ||
                              !ppc_md.pcibios_enable_device_hook(dev, 1))) {
+                                int rc;
+
                                 r->flags &= ~IORESOURCE_UNSET;
-                                pci_assign_resource(dev, idx);
+                                rc = pci_assign_resource(dev, idx);
+                                BUG_ON(rc);
                         }
                 }
 
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 087c92f2a3eb..1ea43160f543 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -212,11 +212,6 @@ int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic,
                 atomic_set(&data.finished, 0);
 
         spin_lock(&call_lock);
-        /* Must grab online cpu count with preempt disabled, otherwise
-         * it can change. */
-        num_cpus = num_online_cpus() - 1;
-        if (!num_cpus)
-                goto done;
 
         /* remove 'self' from the map */
         if (cpu_isset(smp_processor_id(), map))
@@ -224,7 +219,9 @@ int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic,
 
         /* sanity check the map, remove any non-online processors. */
         cpus_and(map, map, cpu_online_map);
-        if (cpus_empty(map))
+
+        num_cpus = cpus_weight(map);
+        if (!num_cpus)
                 goto done;
 
         call_data = &data;