---

yaml --- r: 88797 b: refs/heads/master c: fa8004d h: refs/heads/master i: 88795: 068c69f v: v3
git-mirror · Apr 17, 2008 · e1008c4 · e1008c4
1 parent 0fa4dab
commit e1008c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 148a30f8cf2ac72b7ea6e5c8971fad8d80ec3879
+refs/heads/master: fa8004d8e0c2ba21a44bdc95c44c6c5267a991ec
diff --git a/trunk/arch/x86/kernel/smpboot_32.c b/trunk/arch/x86/kernel/smpboot_32.c
@@ -180,6 +180,9 @@ static void __cpuinit start_secondary(void *unused)
 	smp_callin();
 	while (!cpu_isset(smp_processor_id(), smp_commenced_mask))
 		cpu_relax();
+
+	/* otherwise gcc will move up smp_processor_id before the cpu_init */
+	barrier();
 	/*
 	 * Check TSC synchronization with the BP:
 	 */
@@ -432,6 +435,7 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip)
 	Dprintk("Waiting for send to finish...\n");
 	send_status = safe_apic_wait_icr_idle();
 
+	mb();
 	atomic_set(&init_deasserted, 1);
 
 	/*

diff --git a/trunk/arch/x86/kernel/smpboot_64.c b/trunk/arch/x86/kernel/smpboot_64.c
@@ -239,6 +239,7 @@ void __cpuinit start_secondary(void)
 
 	setup_secondary_clock();
 
+	wmb();
 	cpu_idle();
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -239,6 +239,7 @@ void __cpuinit start_secondary(void) @@
     	setup_secondary_clock();
+    	wmb();
     	cpu_idle();
     }
@@ Expand Down @@