]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: apic - lapic_resume 32bit - unification fix
authorCyrill Gorcunov <gorcunov@gmail.com>
Mon, 18 Aug 2008 16:46:03 +0000 (20:46 +0400)
committerIngo Molnar <mingo@elte.hu>
Tue, 19 Aug 2008 00:07:20 +0000 (02:07 +0200)
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>
arch/x86/kernel/apic_32.c

index 885e306420acd55076f4ee886a8b1ffd6351061e..e975562a76a57cf9fb8035dcdecc0161c76cff12 100644 (file)
@@ -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);