Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 8 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 36d67a8d7cbb..e28a139c29d0 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -44,6 +44,7 @@
 #include <asm/cputable.h>
 #include <asm/system.h>
 #include <asm/mpic.h>
+#include <asm/systemcfg.h>
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
 #endif
@@ -368,9 +369,11 @@ int generic_cpu_disable(void)
         if (cpu == boot_cpuid)
                 return -EBUSY;
 
-        systemcfg->processorCount--;
         cpu_clear(cpu, cpu_online_map);
+#ifdef CONFIG_PPC64
+        _systemcfg->processorCount--;
         fixup_irqs(cpu_online_map);
+#endif
         return 0;
 }
 
@@ -388,9 +391,11 @@ int generic_cpu_enable(unsigned int cpu)
         while (!cpu_online(cpu))
                 cpu_relax();
 
+#ifdef CONFIG_PPC64
         fixup_irqs(cpu_online_map);
         /* counter the irq disable in fixup_irqs */
         local_irq_enable();
+#endif
         return 0;
 }
 
@@ -419,7 +424,9 @@ void generic_mach_cpu_die(void)
         while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE)
                 cpu_relax();
 
+#ifdef CONFIG_PPC64
         flush_tlb_pending();
+#endif
         cpu_set(cpu, cpu_online_map);
         local_irq_enable();
 }