x86: apic - unify lapic_resume - fix

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 5e0738131e589ae58a5ee195a7088419af62de45..ad532dccd11e4af6f86390758262b8f6eefc080e 100644 (file)
--- 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)
                enable_x2apic();
        else
 #endif
+       {
                /*
                 * Make sure the APICBASE points to the right address
                 *
@@ -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);