From 7e2a8dfbd85e42a174b447a870aa517104cc7361 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 3 Jul 2008 15:57:47 +0200
Subject: [PATCH] --- yaml --- r: 99998 b: refs/heads/master c:
 4a7017370aa0a94a00ae5b5705e9169cdcae5fb8 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/asm-x86/smp.h | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b01cd001e1d8..fab778404c49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 329513a35d1a2b6b28d54f5c2c0dde4face8200b
+refs/heads/master: 4a7017370aa0a94a00ae5b5705e9169cdcae5fb8
diff --git a/trunk/include/asm-x86/smp.h b/trunk/include/asm-x86/smp.h
index b324a0645a78..2e221f1ce0b2 100644
--- a/trunk/include/asm-x86/smp.h
+++ b/trunk/include/asm-x86/smp.h
@@ -109,8 +109,6 @@ int native_cpu_up(unsigned int cpunum);
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
 
-extern void prefill_possible_map(void);
-
 void smp_store_cpu_info(int id);
 #define cpu_physical_id(cpu)	per_cpu(x86_cpu_to_apicid, cpu)
 
@@ -119,11 +117,15 @@ static inline int num_booting_cpus(void)
 {
 	return cpus_weight(cpu_callout_map);
 }
+#endif /* CONFIG_SMP */
+
+#if defined(CONFIG_SMP) && defined(CONFIG_HOTPLUG_CPU)
+extern void prefill_possible_map(void);
 #else
 static inline void prefill_possible_map(void)
 {
 }
-#endif /* CONFIG_SMP */
+#endif
 
 extern unsigned disabled_cpus __cpuinitdata;