From e37d4e8a070e83102944b3c9f2fea9cd4053925c Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Mon, 18 Aug 2008 20:46:03 +0400 Subject: [PATCH] --- yaml --- r: 112737 b: refs/heads/master c: e75bedf415f300a08e9bbcc755784e488574a73e h: refs/heads/master i: 112735: 611425d8edf06db7a068f57e918a625984573b4a v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic_32.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8423e0176194..e55f73f30a03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3415610b8e38b26b52a430b8846665c2d6bb3558 +refs/heads/master: e75bedf415f300a08e9bbcc755784e488574a73e diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c index 885e306420ac..e975562a76a5 100644 --- a/trunk/arch/x86/kernel/apic_32.c +++ b/trunk/arch/x86/kernel/apic_32.c @@ -1646,6 +1646,7 @@ static int lapic_resume(struct sys_device *dev) enable_x2apic(); else #endif + { /* * Make sure the APICBASE points to the right address * @@ -1656,6 +1657,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);