Merge branches 'acpi_pad-bugzilla-42981', 'apei-bugzilla-43282', 'video-bugzilla...
authorLen Brown <len.brown@intel.com>
Sat, 30 Jun 2012 04:53:50 +0000 (00:53 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 30 Jun 2012 04:53:50 +0000 (00:53 -0400)
bug fixes

1  2  3  4  5 
arch/x86/kernel/reboot.c
drivers/acpi/video.c

index d840e69a853c0ed3fb48d1bd9f6abc2367275efa,25b48edb847c8203a731b308d2b0eef7e60cf3f3,d840e69a853c0ed3fb48d1bd9f6abc2367275efa,25b48edb847c8203a731b308d2b0eef7e60cf3f3,412db5716d918da68b5492a83347fab6ee77a713..5de92f1abd76fc4d055a42af0c690284c65b7f2d
@@@@@@ -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
     
Simple merge