From: Len Brown Date: Sat, 30 Jun 2012 04:53:50 +0000 (-0400) Subject: Merge branches 'acpi_pad-bugzilla-42981', 'apei-bugzilla-43282', 'video-bugzilla... X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~14555^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6eca954e25e8a67e48334e668b9ac7da21fcbc6f;p=mirror_ubuntu-artful-kernel.git Merge branches 'acpi_pad-bugzilla-42981', 'apei-bugzilla-43282', 'video-bugzilla-43168', 'bugzilla-40002' and 'bugfix-misc' into release bug fixes --- 6eca954e25e8a67e48334e668b9ac7da21fcbc6f diff --cc arch/x86/kernel/reboot.c index d840e69a853c,25b48edb847c,d840e69a853c,25b48edb847c,412db5716d91..5de92f1abd76 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@@@@@ -659,9 -638,12 -659,9 -638,12 -646,10 +646,12 @@@@@@ void native_machine_shutdown(void /* Make certain I only run on the appropriate processor */ 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. + + + * 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