From 4b39124ed95cbbf8ad24608346729b3dea54773a Mon Sep 17 00:00:00 2001 From: Maneesh Soni Date: Tue, 14 Mar 2006 15:03:14 +0530 Subject: [PATCH] --- yaml --- r: 21036 b: refs/heads/master c: 67963132638e67ad3c5aa16765e6f3f2f3cdd85c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/apic.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 760927717eba..c9c1423c9520 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbf0ec6ee001ab89471397ac84105b2e3b2fd986 +refs/heads/master: 67963132638e67ad3c5aa16765e6f3f2f3cdd85c diff --git a/trunk/arch/i386/kernel/apic.c b/trunk/arch/i386/kernel/apic.c index f39e09ef64ec..776c90989e06 100644 --- a/trunk/arch/i386/kernel/apic.c +++ b/trunk/arch/i386/kernel/apic.c @@ -570,16 +570,18 @@ void __devinit setup_local_APIC(void) */ void lapic_shutdown(void) { + unsigned long flags; + if (!cpu_has_apic) return; - local_irq_disable(); + local_irq_save(flags); clear_local_APIC(); if (enabled_via_apicbase) disable_local_APIC(); - local_irq_enable(); + local_irq_restore(flags); } #ifdef CONFIG_PM