From 1570f6897261d7bff8ae93f08f0c6591b8e9da28 Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Wed, 30 May 2012 23:15:41 +0800 Subject: [PATCH] --- yaml --- r: 310615 b: refs/heads/master c: 55c844a4dd16a4d1fdc0cf2a283ec631a02ec448 h: refs/heads/master i: 310613: 55808ffa8e9195e3a14b05b0cf46a84c795c5324 310611: 1ccb6bc6310de649facaf9fb91c48ea1010fca99 310607: 9737ba68a92b86aa6c7445f08dfdecea71598804 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/reboot.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a35fb5761a98..e38379261be0 100644 --- 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 index 79c45af81604..25b48edb847c 100644 --- 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