Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e75bedf4 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

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: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3415610b

arch/x86/kernel/apic_32.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1646,6 +1646,7 @@ static int lapic_resume(struct sys_device *dev) 
		enable_x2apic();

		enable_x2apic();

	else

	else

#endif

#endif

	{

		/*

		/*

		 * Make sure the APICBASE points to the right address

		 * 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_BASE;

		l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;

		l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;

		wrmsr(MSR_IA32_APICBASE, l, h);

		wrmsr(MSR_IA32_APICBASE, l, h);

	}





	apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED);

	apic_write(APIC_LVTERR, ERROR_APIC_VECTOR | APIC_LVT_MASKED);

	apic_write(APIC_ID, apic_pm_state.apic_id);

	apic_write(APIC_ID, apic_pm_state.apic_id);