[PATCH 15/15] x86: apic - lapic_resume 32bit - unification fix

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Cyrill Gorcunov
Date: Monday, August 18, 2008 - 9:46 am

Just add parenthesis to be identical of current
64bit implementation (so diff will not complain).

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 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 885e306..e975562 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);
-- 
1.6.0.rc1.34.g0fe8c

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/15] apic: unification series 5, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 01/15] x86: apic - rearrange maxcpu definition, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 02/15] x86: apic - unify setup_boot_APIC_clock, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 03/15] x86: apic - unify disable_local_APIC, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 04/15] x86: apic - unify lapic_shutdown, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 05/15] x86: apic - unify connect_bsp_APIC, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 06/15] x86: apic - unify lapic_setup_esr, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 07/15] x86: apic - unify __setup_APIC_LVTT, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 08/15] x86: apic - unify disconnect_bsp_APIC, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 09/15] x86: apic - generic_processor_info, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 10/15] x86: apic - unify end_local_APIC_setup, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 11/15] x86: apic - unify local_apic_timer_interrupt, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 12/15] x86: apic - unify apic_set_verbosity, Cyrill Gorcunov, (Mon Aug 18, 9:46 am)
[PATCH 14/15] x86: apic - rearrange parse_lapic_timer_c2_ok, Cyrill Gorcunov, (Mon Aug 18, 9:46 am)
[PATCH 15/15] x86: apic - lapic_resume 32bit - unification fix, Cyrill Gorcunov, (Mon Aug 18, 9:46 am)
Re: [PATCH 01/15] x86: apic - rearrange maxcpu definition, Cyrill Gorcunov, (Mon Aug 18, 9:59 am)
Re: [PATCH 0/15] apic: unification series 5, H. Peter Anvin, (Mon Aug 18, 10:22 am)
Re: [PATCH 0/15] apic: unification series 5, Cyrill Gorcunov, (Mon Aug 18, 10:28 am)
Re: [PATCH 0/15] apic: unification series 5, Cyrill Gorcunov, (Mon Aug 18, 12:12 pm)
Re: [PATCH 0/15] apic: unification series 5, Ingo Molnar, (Mon Aug 18, 5:09 pm)