aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-08-18 20:46:03 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-19 02:07:20 +0200
commite75bedf415f300a08e9bbcc755784e488574a73e (patch)
treee98b2096bd7d53cda7fe85805566100aa84b52b0 /arch
parent3415610b8e38b26b52a430b8846665c2d6bb3558 (diff)
x86: apic - lapic_resume 32bit - unification fix
Just add parenthesis to be identical of current 64bit implementation (so diff will not complain). Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/apic_32.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 885e306420a..e975562a76a 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/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);