---

yaml --- r: 88837 b: refs/heads/master c: 4370ee4 h: refs/heads/master i: 88835: 0220f5f v: v3
git-mirror · Apr 17, 2008 · 92b9738 · 92b9738
1 parent 37b0a1f
commit 92b9738
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6becedbb06072c5741d4057b9facecb4b3143711
+refs/heads/master: 4370ee4d3b7772158174bf6f0bf08359c2ccf54b
diff --git a/trunk/arch/x86/kernel/smpboot_32.c b/trunk/arch/x86/kernel/smpboot_32.c
@@ -702,20 +702,6 @@ void cpu_exit_clear(void)
 }
 #endif
 
-static void __cpuinit __smp_prepare_cpu(int cpu)
-{
-	int	apicid;
-
-	apicid = per_cpu(x86_cpu_to_apicid, cpu);
-
-	/* init low mem mapping */
-	clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
-			min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));
-	flush_tlb_all();
-
-	do_boot_cpu(apicid, cpu);
-}
-
 static int boot_cpu_logical_apicid;
 /* Where the IO area was mapped on multiquad, always 0 otherwise */
 void *xquad_portio;
@@ -872,7 +858,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
 
 	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
 
-	__smp_prepare_cpu(cpu);
+	/* init low mem mapping */
+	clone_pgd_range(swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
+			min_t(unsigned long, KERNEL_PGD_PTRS, USER_PGD_PTRS));
+	flush_tlb_all();
+
+	do_boot_cpu(apicid, cpu);
 
 	/* In case one didn't come up */
 	if (!cpu_isset(cpu, cpu_callin_map)) {