diff --git a/[refs] b/[refs]
index 37fc266a9611..cc3e59f0813e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1c582d0720f2eff61043e90711767decf37b917
+refs/heads/master: 62e6f1e8bb7c48c02b8bdb3085c5f6365682149b
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 450e6ee52ab6..9def935ab13a 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -397,10 +397,6 @@ static void __init smp_init(void)
 {
 	unsigned int cpu;
 
-#ifndef CONFIG_HOTPLUG_CPU
-	cpu_possible_map = cpu_present_map;
-#endif
-
 	/* FIXME: This should be done in userspace --RR */
 	for_each_present_cpu(cpu) {
 		if (num_online_cpus() >= max_cpus)
@@ -545,10 +541,6 @@ asmlinkage void __init start_kernel(void)
 	setup_arch(&command_line);
 	setup_command_line(command_line);
 	unwind_setup();
-#ifndef CONFIG_HOTPLUG_CPU
-	if (max_cpus < 2)
-		cpu_possible_map = cpu_online_map;
-#endif
 	setup_per_cpu_areas();
 	smp_prepare_boot_cpu();	/* arch-specific boot-cpu hooks */