2 files changed, 20 insertions, 5 deletions

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index a15e18a0025..558b8336855 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -24,6 +24,7 @@
 #include <linux/config.h>       /* CONFIG_ALPHA_LCA etc */
 #include <linux/mc146818rtc.h>
 #include <linux/console.h>
+#include <linux/cpu.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/string.h>
@@ -471,6 +472,22 @@ page_is_ram(unsigned long pfn)
         return 0;
 }
 
+static int __init
+register_cpus(void)
+{
+        int i;
+
+        for_each_possible_cpu(i) {
+                struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL);
+                if (!p)
+                        return -ENOMEM;
+                register_cpu(p, i, NULL);
+        }
+        return 0;
+}
+
+arch_initcall(register_cpus);
+
 void __init
 setup_arch(char **cmdline_p)
 {
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 02c2db08114..185255416e8 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -439,7 +439,7 @@ setup_smp(void)
                         if ((cpu->flags & 0x1cc) == 0x1cc) {
                                 smp_num_probed++;
                                 /* Assume here that "whami" == index */
-                                cpu_set(i, cpu_possible_map);
+                                cpu_set(i, cpu_present_mask);
                                 cpu->pal_revision = boot_cpu_palrev;
                         }
 
@@ -450,9 +450,8 @@ setup_smp(void)
                 }
         } else {
                 smp_num_probed = 1;
-                cpu_set(boot_cpuid, cpu_possible_map);
+                cpu_set(boot_cpuid, cpu_present_mask);
         }
-        cpu_present_mask = cpumask_of_cpu(boot_cpuid);
 
         printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_mask = %lx\n",
                smp_num_probed, cpu_possible_map.bits[0]);
@@ -488,9 +487,8 @@ void __devinit
 smp_prepare_boot_cpu(void)
 {
         /*
-         * Mark the boot cpu (current cpu) as both present and online
+         * Mark the boot cpu (current cpu) as online
          */ 
-        cpu_set(smp_processor_id(), cpu_present_mask);
         cpu_set(smp_processor_id(), cpu_online_map);
 }