---

yaml --- r: 310615 b: refs/heads/master c: 55c844a h: refs/heads/master i: 310613: 55808ff 310611: 1ccb6bc 310607: 9737ba6 v: v3
git-mirror · Jun 6, 2012 · 1570f68 · 1570f68
1 parent b4eaf64
commit 1570f68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7071f6b2889bb41bea61891d8a3e6e70517ef5e6
+refs/heads/master: 55c844a4dd16a4d1fdc0cf2a283ec631a02ec448
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
@@ -639,9 +639,11 @@ void native_machine_shutdown(void)
 	set_cpus_allowed_ptr(current, cpumask_of(reboot_cpu_id));
 
 	/*
-	 * O.K Now that I'm on the appropriate processor,
-	 * stop all of the others.
+	 * O.K Now that I'm on the appropriate processor, stop all of the
+	 * others. Also disable the local irq to not receive the per-cpu
+	 * timer interrupt which may trigger scheduler's load balance.
 	 */
+	local_irq_disable();
 	stop_other_cpus();
 #endif