diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-16 23:21:52 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-17 14:41:48 +0200 |
| commit | 24968cfdd4c3cf61338495dd0f9bb8a6907d2087 (patch) | |
| tree | fe3427ce98c5536b19338622cb2304333b45c2b8 /arch/x86/kernel/apic_32.c | |
| parent | 92206c909ad1d4f9c355b4842722d5a355d6b76b (diff) | |
| download | op-kernel-dev-24968cfdd4c3cf61338495dd0f9bb8a6907d2087.zip op-kernel-dev-24968cfdd4c3cf61338495dd0f9bb8a6907d2087.tar.gz | |
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_32.c')
| -rw-r--r-- | arch/x86/kernel/apic_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 3d40213..6cb8aaa 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -1582,7 +1582,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state) apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR); apic_pm_state.apic_tmict = apic_read(APIC_TMICT); apic_pm_state.apic_tdcr = apic_read(APIC_TDCR); -#ifdef CONFIG_X86_MCE_P4THERMAL +#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL) if (maxlvt >= 5) apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR); #endif |
