diff options
| author | Len Brown <len.brown@intel.com> | 2004-12-01 02:40:31 -0500 |
|---|---|---|
| committer | Len Brown <lenb@dhcppc3.> | 2004-12-01 02:40:31 -0500 |
| commit | 7b28bc9322892dba038d3485de0a0ca3227533fa (patch) | |
| tree | 9240c95f6ae9eb71a8a186b9b1f18d102ee80927 | |
| parent | 99e7a1d6e92d8f8fd19fa62f4b43ab4d69f3cd75 (diff) | |
Cset exclude: len.brown@intel.com[lenb]|ChangeSet|20041109085620|42985
| -rw-r--r-- | arch/i386/kernel/apic.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index 1bf09be85d39..64c175ff4a92 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c @@ -514,23 +514,9 @@ static struct { unsigned int apic_thmr; } apic_pm_state; -static int lapic_shutdown(struct sys_device *dev) -{ - unsigned long flags; - - if (!apic_pm_state.active) - return 0; - - - local_irq_save(flags); - disable_local_APIC(); - local_irq_restore(flags); - - return 0; -} - static int lapic_suspend(struct sys_device *dev, u32 state) { + unsigned long flags; if (!apic_pm_state.active) return 0; @@ -549,7 +535,10 @@ static int lapic_suspend(struct sys_device *dev, u32 state) apic_pm_state.apic_tdcr = apic_read(APIC_TDCR); apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR); - return lapic_shutdown(dev); + local_irq_save(flags); + disable_local_APIC(); + local_irq_restore(flags); + return 0; } static int lapic_resume(struct sys_device *dev) @@ -598,7 +587,6 @@ static int lapic_resume(struct sys_device *dev) static struct sysdev_class lapic_sysclass = { set_kset_name("lapic"), - .shutdown = lapic_shutdown, .resume = lapic_resume, .suspend = lapic_suspend, }; |