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

Commit 9e5c5f1d authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

x86: move mp_ioapic_routing to boot.c 



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

arch/x86/kernel/acpi/boot.c

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,8 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e 


#ifdef CONFIG_X86_IO_APIC



struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];



static int __init

acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)

{

arch/x86/kernel/mpparse_32.c

+1 −6
Original line number Diff line number Diff line
@@ -837,12 +837,7 @@ void __cpuinit mp_register_lapic (int id, u8 enabled) 
#define MP_ISA_BUS		0

#define MP_MAX_IOAPIC_PIN	127



static struct mp_ioapic_routing {

	int			apic_id;

	int			gsi_base;

	int			gsi_end;

	u32			pin_programmed[4];

} mp_ioapic_routing[MAX_IO_APICS];

extern struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];



static int mp_find_ioapic (int gsi)

{

arch/x86/kernel/mpparse_64.c

+1 −6
Original line number Diff line number Diff line
@@ -630,12 +630,7 @@ void __cpuinit mp_register_lapic(int id, u8 enabled) 
#define MP_ISA_BUS		0

#define MP_MAX_IOAPIC_PIN	127



static struct mp_ioapic_routing {

	int apic_id;

	int gsi_base;

	int gsi_end;

	u32 pin_programmed[4];

} mp_ioapic_routing[MAX_IO_APICS];

extern struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];



static int mp_find_ioapic(int gsi)

{

include/asm-x86/io_apic.h

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ extern int nr_ioapic_registers[MAX_IO_APICS]; 
 * MP-BIOS irq configuration table structures:

 */



struct mp_ioapic_routing {

	int apic_id;

	int gsi_base;

	int gsi_end;

	u32 pin_programmed[4];

};



/* I/O APIC entries */

extern struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS];