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

Commit 53301f36 authored by Yinghai Lu's avatar Yinghai Lu Committed by Thomas Gleixner
Browse files

x86, sfi: Use register_lapic_address() 



register_lapic_address() and mp_sfi_register_lapic_address() are
almost identical. Use the common function.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Len Brown <lenb@kernel.org>
LKML-Reference: <4CFDF693.6000908@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 326a2e6b

arch/x86/platform/sfi/sfi.c

+1 −12
Original line number Diff line number Diff line
@@ -34,17 +34,6 @@ 
#ifdef CONFIG_X86_LOCAL_APIC

static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;



static void __init mp_sfi_register_lapic_address(unsigned long address)

{

	mp_lapic_addr = address;



	set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);

	if (boot_cpu_physical_apicid == -1U)

		boot_cpu_physical_apicid = read_apic_id();



	pr_info("Boot CPU = %d\n", boot_cpu_physical_apicid);

}



/* All CPUs enumerated by SFI must be present and enabled */

static void __cpuinit mp_sfi_register_lapic(u8 id)

{
@@ -110,7 +99,7 @@ static int __init sfi_parse_ioapic(struct sfi_table_header *table) 
int __init sfi_platform_init(void)

{

#ifdef CONFIG_X86_LOCAL_APIC

	mp_sfi_register_lapic_address(sfi_lapic_addr);

	register_lapic_address(sfi_lapic_addr);

	sfi_table_parse(SFI_SIG_CPUS, NULL, NULL, sfi_parse_cpus);

#endif

#ifdef CONFIG_X86_IO_APIC