diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:22:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-06-20 14:22:34 +0200 |
commit | 6a991acceedce3ca93caef8ba7af2468c9451614 (patch) | |
tree | 1997d71fc57bdebd12fc70a73070281614b52f15 /arch/x86/kernel/reboot.c | |
parent | 70fb74a5420f9caa3e001d65004e4b669124283e (diff) | |
parent | 485802a6c524e62b5924849dd727ddbb1497cc71 (diff) | |
download | linux-stable-6a991acceedce3ca93caef8ba7af2468c9451614.tar.gz linux-stable-6a991acceedce3ca93caef8ba7af2468c9451614.tar.bz2 linux-stable-6a991acceedce3ca93caef8ba7af2468c9451614.zip |
Merge commit 'v3.5-rc3' into x86/debug
Merge it in to pick up a fix that we are going to clean up in this
branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/reboot.c')
-rw-r--r-- | arch/x86/kernel/reboot.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index ab3f06260712..10ae9be07b47 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -643,9 +643,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 |