Skip to content

Commit

Permalink
x86: apic - unify lapic_resume - fix
Browse files Browse the repository at this point in the history
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Aug 18, 2008
1 parent cf9768d commit d5e629a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/x86/kernel/apic_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,7 @@ static int lapic_resume(struct sys_device *dev)
enable_x2apic();
else
#endif
{
/*
* Make sure the APICBASE points to the right address
*
Expand All @@ -1456,6 +1457,7 @@ static int lapic_resume(struct sys_device *dev)
l &= ~MSR_IA32_APICBASE_BASE;
l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;
wrmsr(MSR_IA32_APICBASE, l, h);
}

apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED);
apic_write(APIC_ID, apic_pm_state.apic_id);
Expand Down

0 comments on commit d5e629a

Please sign in to comment.