---

yaml --- r: 110350 b: refs/heads/master c: 2bd455d h: refs/heads/master v: v3
git-mirror · Aug 15, 2008 · 23cae4a · 23cae4a
1 parent 5902f55
commit 23cae4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59f09ba2b62e6f89beeb4c8fc2c83fe14321dda9
+refs/heads/master: 2bd455dbfebfd632a8dcf1d3d1612737986fde0a
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
@@ -1271,16 +1271,13 @@ __init void prefill_possible_map(void)
 	if (!num_processors)
 		num_processors = 1;
 
-#ifdef CONFIG_HOTPLUG_CPU
 	if (additional_cpus == -1) {
 		if (disabled_cpus > 0)
 			additional_cpus = disabled_cpus;
 		else
 			additional_cpus = 0;
 	}
-#else
-	additional_cpus = 0;
-#endif
+
 	possible = num_processors + additional_cpus;
 	if (possible > NR_CPUS)
 		possible = NR_CPUS;