diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-18 12:46:03 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-18 20:07:20 -0400 |
commit | e75bedf415f300a08e9bbcc755784e488574a73e (patch) | |
tree | e98b2096bd7d53cda7fe85805566100aa84b52b0 | |
parent | 3415610b8e38b26b52a430b8846665c2d6bb3558 (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>
-rw-r--r-- | arch/x86/kernel/apic_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 885e306420ac..e975562a76a5 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) | |||
1646 | enable_x2apic(); | 1646 | enable_x2apic(); |
1647 | else | 1647 | else |
1648 | #endif | 1648 | #endif |
1649 | { | ||
1649 | /* | 1650 | /* |
1650 | * Make sure the APICBASE points to the right address | 1651 | * Make sure the APICBASE points to the right address |
1651 | * | 1652 | * |
@@ -1656,6 +1657,7 @@ static int lapic_resume(struct sys_device *dev) | |||
1656 | l &= ~MSR_IA32_APICBASE_BASE; | 1657 | l &= ~MSR_IA32_APICBASE_BASE; |
1657 | l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr; | 1658 | l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr; |
1658 | wrmsr(MSR_IA32_APICBASE, l, h); | 1659 | wrmsr(MSR_IA32_APICBASE, l, h); |
1660 | } | ||
1659 | 1661 | ||
1660 | apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED); | 1662 | apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED); |
1661 | apic_write(APIC_ID, apic_pm_state.apic_id); | 1663 | apic_write(APIC_ID, apic_pm_state.apic_id); |