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

Commit 5b743573 authored by Shaohua Li's avatar Shaohua Li Committed by Linus Torvalds
Browse files

[PATCH] x86_64: lapic resume uses correct base address 



uses correct lapic base address. The set_fixmap appears useless.

Signed-off-by: default avatarShaohua <Li&lt;shaohua.li@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e25db98d

arch/x86_64/kernel/apic.c

+1 −4
Original line number Diff line number Diff line
@@ -499,13 +499,10 @@ static int lapic_resume(struct sys_device *dev) 
	if (!apic_pm_state.active)

		return 0;



	/* XXX: Pavel needs this for S3 resume, but can't explain why */

	set_fixmap_nocache(FIX_APIC_BASE, APIC_DEFAULT_PHYS_BASE);



	local_irq_save(flags);

	rdmsr(MSR_IA32_APICBASE, l, h);

	l &= ~MSR_IA32_APICBASE_BASE;

	l |= MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_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);