diff --git a/[refs] b/[refs]
index e2e6ebf10b9d..f02d46599081 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 222b9f933a76b127a073f45278d2b0199587e8ce
+refs/heads/master: 9a98e2f7326d626d75cab2fe108c34b733227918
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 006dcd547dc2..64466ea1984c 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -645,24 +645,6 @@ static void run_init_process(char *init_filename)
 	execve(init_filename, argv_init, envp_init);
 }
 
-static inline void fixup_cpu_present_map(void)
-{
-#ifdef CONFIG_SMP
-	int i;
-
-	/*
-	 * If arch is not hotplug ready and did not populate
-	 * cpu_present_map, just make cpu_present_map same as cpu_possible_map
-	 * for other cpu bringup code to function as normal. e.g smp_init() etc.
-	 */
-	if (cpus_empty(cpu_present_map)) {
-		for_each_cpu(i) {
-			cpu_set(i, cpu_present_map);
-		}
-	}
-#endif
-}
-
 static int init(void * unused)
 {
 	lock_kernel();
@@ -684,7 +666,6 @@ static int init(void * unused)
 
 	do_pre_smp_initcalls();
 
-	fixup_cpu_present_map();
 	smp_init();
 	sched_init_smp();