lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: move mp_ioapic_routing to boot.c

Browse Source 
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Alexey Starikovskiy
2008-04-04 23:41:26 +04:00
committed by Ingo Molnar
parent 9c7408f3c4
commit 9e5c5f1dd2
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/acpi/boot.c
View File

@@ -320,6 +320,8 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];
static int __init static int __init
acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end) acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
{ {

7
arch/x86/kernel/mpparse_32.c
View File

@@ -837,12 +837,7 @@ void __cpuinit mp_register_lapic (int id, u8 enabled)
#define MP_ISA_BUS 0 #define MP_ISA_BUS 0
#define MP_MAX_IOAPIC_PIN 127 #define MP_MAX_IOAPIC_PIN 127
static struct mp_ioapic_routing { extern struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];
int apic_id;
int gsi_base;
int gsi_end;
u32 pin_programmed[4];
} mp_ioapic_routing[MAX_IO_APICS];
static int mp_find_ioapic (int gsi) static int mp_find_ioapic (int gsi)
{ {

7
arch/x86/kernel/mpparse_64.c
View File

@@ -630,12 +630,7 @@ void __cpuinit mp_register_lapic(int id, u8 enabled)
#define MP_ISA_BUS 0 #define MP_ISA_BUS 0
#define MP_MAX_IOAPIC_PIN 127 #define MP_MAX_IOAPIC_PIN 127
static struct mp_ioapic_routing { extern struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];
int apic_id;
int gsi_base;
int gsi_end;
u32 pin_programmed[4];
} mp_ioapic_routing[MAX_IO_APICS];
static int mp_find_ioapic(int gsi) static int mp_find_ioapic(int gsi)
{ {

7
include/asm-x86/io_apic.h
View File

@@ -110,6 +110,13 @@ extern int nr_ioapic_registers[MAX_IO_APICS];
* MP-BIOS irq configuration table structures: * 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 */ /* I/O APIC entries */
extern struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; extern struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS];