1 files changed, 11 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 44a6a3c47feb..35f8f443c14f 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -92,7 +92,8 @@ unsigned long __init early_init(unsigned long dt_ptr)
 
         /* First zero the BSS -- use memset_io, some platforms don't have
          * caches on yet */
-        memset_io((void __iomem *)PTRRELOC(&__bss_start), 0, _end - __bss_start);
+        memset_io((void __iomem *)PTRRELOC(&__bss_start), 0,
+                        __bss_stop - __bss_start);
 
         /*
          * Identify the CPU type and fix up code sections
@@ -195,18 +196,22 @@ EXPORT_SYMBOL(nvram_sync);
 
 #endif /* CONFIG_NVRAM */
 
-static struct cpu cpu_devices[NR_CPUS];
+static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
 int __init ppc_init(void)
 {
-        int i;
+        int cpu;
 
         /* clear the progress line */
-        if ( ppc_md.progress ) ppc_md.progress("             ", 0xffff);
+        if (ppc_md.progress)
+                ppc_md.progress("             ", 0xffff);
 
         /* register CPU devices */
-        for_each_possible_cpu(i)
-                register_cpu(&cpu_devices[i], i);
+        for_each_possible_cpu(cpu) {
+                struct cpu *c = &per_cpu(cpu_devices, cpu);
+                c->hotpluggable = 1;
+                register_cpu(c, cpu);
+        }
 
         /* call platform init */
         if (ppc_md.init != NULL) {