diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-16 15:21:52 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-17 08:41:48 -0400 |
commit | 24968cfdd4c3cf61338495dd0f9bb8a6907d2087 (patch) | |
tree | fe3427ce98c5536b19338622cb2304333b45c2b8 /arch/x86/kernel/apic_64.c | |
parent | 92206c909ad1d4f9c355b4842722d5a355d6b76b (diff) |
x86: apic - unify lapic_suspend
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r-- | arch/x86/kernel/apic_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index e542a2d08de5..13dea935b4eb 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -1390,10 +1390,11 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state) | |||
1390 | apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR); | 1390 | apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR); |
1391 | apic_pm_state.apic_tmict = apic_read(APIC_TMICT); | 1391 | apic_pm_state.apic_tmict = apic_read(APIC_TMICT); |
1392 | apic_pm_state.apic_tdcr = apic_read(APIC_TDCR); | 1392 | apic_pm_state.apic_tdcr = apic_read(APIC_TDCR); |
1393 | #ifdef CONFIG_X86_MCE_INTEL | 1393 | #if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL) |
1394 | if (maxlvt >= 5) | 1394 | if (maxlvt >= 5) |
1395 | apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR); | 1395 | apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR); |
1396 | #endif | 1396 | #endif |
1397 | |||
1397 | local_irq_save(flags); | 1398 | local_irq_save(flags); |
1398 | disable_local_APIC(); | 1399 | disable_local_APIC(); |
1399 | local_irq_restore(flags); | 1400 | local_irq_restore(flags); |