diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index c49ebcc6c41e..6f20fa92bbaf 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -331,8 +331,6 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e | |||
331 | 331 | ||
332 | #ifdef CONFIG_X86_IO_APIC | 332 | #ifdef CONFIG_X86_IO_APIC |
333 | 333 | ||
334 | struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS]; | ||
335 | |||
336 | static int __init | 334 | static int __init |
337 | acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end) | 335 | acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end) |
338 | { | 336 | { |
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 404683b94e79..bb7213335991 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Intel Multiprocessor Specification 1.1 and 1.4 | 2 | 2 * Intel Multiprocessor Specification 1.1 and 1.4 |
3 | * compliant MP-table parsing routines. | 3 | * compliant MP-table parsing routines. |
4 | * | 4 | * |
5 | * (c) 1995 Alan Cox, Building #3 <alan@redhat.com> | 5 | * (c) 1995 Alan Cox, Building #3 <alan@redhat.com> |
@@ -805,7 +805,7 @@ int es7000_plat; | |||
805 | 805 | ||
806 | #define MP_ISA_BUS 0 | 806 | #define MP_ISA_BUS 0 |
807 | 807 | ||
808 | extern struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS]; | 808 | static struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS]; |
809 | 809 | ||
810 | static int mp_find_ioapic(int gsi) | 810 | static int mp_find_ioapic(int gsi) |
811 | { | 811 | { |