---

yaml --- r: 88732 b: refs/heads/master c: fc25da9 h: refs/heads/master v: v3
git-mirror · Apr 17, 2008 · f959da2 · f959da2
1 parent 531e017
commit f959da2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70708a18e834fd709a4f497bb419ec84d1eb3511
+refs/heads/master: fc25da9ec6c910976b76c70f7604a838679f75b2
diff --git a/trunk/arch/x86/kernel/smpboot_64.c b/trunk/arch/x86/kernel/smpboot_64.c
@@ -261,9 +261,9 @@ void __cpuinit start_secondary(void)
 	/*
 	 * Allow the master to continue.
 	 */
+	spin_unlock(&vector_lock);
 	cpu_set(smp_processor_id(), cpu_online_map);
 	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
-	spin_unlock(&vector_lock);
 
 	unlock_ipi_call_lock();
 
@@ -879,10 +879,8 @@ int __cpu_disable(void)
 	local_irq_disable();
 	remove_siblinginfo(cpu);
 
-	spin_lock(&vector_lock);
 	/* It's now safe to remove this processor from the online map */
 	cpu_clear(cpu, cpu_online_map);
-	spin_unlock(&vector_lock);
 	remove_cpu_from_maps();
 	fixup_irqs(cpu_online_map);
 	return 0;