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

Commit 31d2092e authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

x86: move mp_register_lapic_address to boot.c 



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent dfac2189

arch/x86/kernel/acpi/boot.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -765,6 +765,16 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) 
 * Parse LAPIC entries in MADT

 * Parse LAPIC entries in MADT

 * returns 0 on success, < 0 on error

 * returns 0 on success, < 0 on error

 */

 */



static void __init acpi_register_lapic_address(unsigned long address)

{

	mp_lapic_addr = address;



	set_fixmap_nocache(FIX_APIC_BASE, address);

	if (boot_cpu_physical_apicid == -1U)

		boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());

}



static int __init acpi_parse_madt_lapic_entries(void)

static int __init acpi_parse_madt_lapic_entries(void)

{

{

	int count;

	int count;
@@ -786,7 +796,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 
		return count;

		return count;

	}

	}





	mp_register_lapic_address(acpi_lapic_addr);

	acpi_register_lapic_address(acpi_lapic_addr);





	count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC,

	count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC,

				      acpi_parse_sapic, MAX_APICS);

				      acpi_parse_sapic, MAX_APICS);

arch/x86/kernel/mpparse_32.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -785,18 +785,6 @@ void __init find_smp_config (void) 




#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI





void __init mp_register_lapic_address(u64 address)

{

	mp_lapic_addr = (unsigned long) address;



	set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);



	if (boot_cpu_physical_apicid == -1U)

		boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id());



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

}



#ifdef	CONFIG_X86_IO_APIC

#ifdef	CONFIG_X86_IO_APIC





#define MP_ISA_BUS		0

#define MP_ISA_BUS		0

arch/x86/kernel/mpparse_64.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -594,14 +594,6 @@ void __init find_smp_config(void) 




#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI





void __init mp_register_lapic_address(u64 address)

{

	mp_lapic_addr = (unsigned long)address;

	set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);

	if (boot_cpu_physical_apicid == -1U)

		boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());

}



#define MP_ISA_BUS		0

#define MP_ISA_BUS		0

#define MP_MAX_IOAPIC_PIN	127

#define MP_MAX_IOAPIC_PIN	127

include/asm-x86/mpspec.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ extern void get_smp_config(void); 




void __cpuinit generic_processor_info(int apicid, int version);

void __cpuinit generic_processor_info(int apicid, int version);

#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

extern void mp_register_lapic_address(u64 address);

extern void mp_register_ioapic(int id, u32 address, u32 gsi_base);

extern void mp_register_ioapic(int id, u32 address, u32 gsi_base);

extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,

extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,

				   u32 gsi);

				   u32 gsi);