fix non-ACPI IOAPIC build

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 633e82b72c1d316b1daa520c23295d33ba6201b1..19bcb5dafd9b6e641ced6284408874514a50d716 100644 (file)
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -808,6 +808,7 @@ void __init find_smp_config (void)
                smp_scan_config(address, 0x400);
 }
 
+int (*platform_rename_gsi)(int ioapic, int gsi);
 
 /* --------------------------------------------------------------------------
                             ACPI-based MP Configuration
@@ -1055,8 +1056,6 @@ void __init mp_config_acpi_legacy_irqs (void)
        }
 }
 
-int (*platform_rename_gsi)(int ioapic, int gsi);
-
 void mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
 {
        int                     ioapic = -1;

diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
index 9ab8efc72889035edc3964a0b698a4169b57b101..9fce5e36c821c4bb56b41d47036b50708ddc14e5 100644 (file)
--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -128,7 +128,6 @@ static inline void disable_acpi(void)
 #define FIX_ACPI_PAGES 4
 
 extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
-extern int (*platform_rename_gsi)(int ioapic, int gsi);
 
 #ifdef CONFIG_X86_IO_APIC
 extern int skip_ioapic_setup;
@@ -156,6 +155,8 @@ static inline void disable_ioapic_setup(void)
 
 #endif
 
+extern int (*platform_rename_gsi)(int ioapic, int gsi);
+
 #ifdef CONFIG_ACPI_PCI
 static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
 static inline void acpi_disable_pci(void)