aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-05-12 15:43:35 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 10:55:12 +0200
commit7f028bc0fd119a4fc65aedc07728ce85c8813d33 (patch)
tree72390e7e0328d73cd525cdae45948cdcd0dfbae9
parentba5b14cc0311af6ed20dc25aa98a1d5ea6f2e6c0 (diff)
x86: move mp_ioapic_routing to mpparse and make it static
mpparse is the only user of mp_ioapic_routing. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/acpi/boot.c2
-rw-r--r--arch/x86/kernel/mpparse.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index c49ebcc6c41..6f20fa92bba 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
#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)
{
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 404683b94e7..bb721333599 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -1,5 +1,5 @@
/*
- * Intel Multiprocessor Specification 1.1 and 1.4
+2 * Intel Multiprocessor Specification 1.1 and 1.4
* compliant MP-table parsing routines.
*
* (c) 1995 Alan Cox, Building #3 <alan@redhat.com>
@@ -805,7 +805,7 @@ int es7000_plat;
#define MP_ISA_BUS 0
-extern struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];
+static struct mp_ioapic_routing mp_ioapic_routing[MAX_IO_APICS];
static int mp_find_ioapic(int gsi)
{