Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index d953e510f68d..00f1dc3dfd5f 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -120,8 +120,9 @@ void __cpuinit
 smp_callin(void)
 {
         int cpuid = hard_smp_processor_id();
+        cpumask_t mask = cpu_online_map;
 
-        if (cpu_test_and_set(cpuid, cpu_online_map)) {
+        if (cpu_test_and_set(cpuid, mask)) {
                 printk("??, cpu 0x%x already present??\n", cpuid);
                 BUG();
         }