diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-18 00:12:27 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-18 03:24:54 -0400 |
commit | d5e629a6f88137fb77c4cc857be5ea7c3f27110d (patch) | |
tree | 55e93d411cb0635fc1420f4d0f7f6ae1ce905315 /arch/x86/kernel/apic_64.c | |
parent | cf9768d7514d59b3179a886c4a47908d72e6cf76 (diff) |
x86: apic - unify lapic_resume - fix
Signed-off-by: Yinghai Lu <yhlu.kernel@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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 5e0738131e58..ad532dccd11e 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -1446,6 +1446,7 @@ static int lapic_resume(struct sys_device *dev) | |||
1446 | enable_x2apic(); | 1446 | enable_x2apic(); |
1447 | else | 1447 | else |
1448 | #endif | 1448 | #endif |
1449 | { | ||
1449 | /* | 1450 | /* |
1450 | * Make sure the APICBASE points to the right address | 1451 | * Make sure the APICBASE points to the right address |
1451 | * | 1452 | * |
@@ -1456,6 +1457,7 @@ static int lapic_resume(struct sys_device *dev) | |||
1456 | l &= ~MSR_IA32_APICBASE_BASE; | 1457 | l &= ~MSR_IA32_APICBASE_BASE; |
1457 | l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr; | 1458 | l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr; |
1458 | wrmsr(MSR_IA32_APICBASE, l, h); | 1459 | wrmsr(MSR_IA32_APICBASE, l, h); |
1460 | } | ||
1459 | 1461 | ||
1460 | apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED); | 1462 | apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED); |
1461 | apic_write(APIC_ID, apic_pm_state.apic_id); | 1463 | apic_write(APIC_ID, apic_pm_state.apic_id); |