From f767ccfd89b759b0f781882bf4dca4659c384b0e Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Mon, 26 Jun 2006 21:33:09 -0500
Subject: [PATCH] --- yaml --- r: 30855 b: refs/heads/master c:
 3c101cf024c3f126e174bf0d8946c587127e3c30 h: refs/heads/master i:   30853:
 6c8beb27642da980bb2bee28c775e317a7c27bbb   30851:
 2a70f5604d9313d06ea6b591348d341fd84de5d6   30847:
 5f9a535cfe97cf2293f34ad4799b35451f6b9a06 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/i386/mach-voyager/voyager_smp.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99c39b3a7c67..20875a109c31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12e56b601f66a415f88e7d60f6b6707a19c430c9
+refs/heads/master: 3c101cf024c3f126e174bf0d8946c587127e3c30
diff --git a/trunk/arch/i386/mach-voyager/voyager_smp.c b/trunk/arch/i386/mach-voyager/voyager_smp.c
index 70e560a1b79a..8242af9ebc6f 100644
--- a/trunk/arch/i386/mach-voyager/voyager_smp.c
+++ b/trunk/arch/i386/mach-voyager/voyager_smp.c
@@ -661,6 +661,7 @@ do_boot_cpu(__u8 cpu)
 		print_cpu_info(&cpu_data[cpu]);
 		wmb();
 		cpu_set(cpu, cpu_callout_map);
+		cpu_set(cpu, cpu_present_map);
 	}
 	else {
 		printk("CPU%d FAILED TO BOOT: ", cpu);
@@ -1912,6 +1913,7 @@ void __devinit smp_prepare_boot_cpu(void)
 	cpu_set(smp_processor_id(), cpu_online_map);
 	cpu_set(smp_processor_id(), cpu_callout_map);
 	cpu_set(smp_processor_id(), cpu_possible_map);
+	cpu_set(smp_processor_id(), cpu_present_map);
 }
 
 int __devinit