[ACPI] platform_rename_gsi() is no longer limited to ACPI specific code,

so call it ioapic_renumber_irq().

A note to google:
GSI is a Global System Interrupt -- a flat, linear, global IRQ number.

Suggested-by: Linus Torvalds
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index d718075af3b91bc291353801b46b7621a6070adc..e3e57d4ca25fa73e727c6dc2297b09b8aadf689e 100644 (file)
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -42,6 +42,8 @@
 
 #include "io_ports.h"
 
+int (*ioapic_renumber_irq)(int ioapic, int irq);
+
 static spinlock_t ioapic_lock = SPIN_LOCK_UNLOCKED;
 
 /*
@@ -1069,11 +1071,13 @@ static int pin_2_irq(int idx, int apic, int pin)
                        while (i < apic)
                                irq += nr_ioapic_registers[i++];
                        irq += pin;
+
                        /*
-                        * For MPS mode, so far only used by ES7000 platform
+                        * For MPS mode, so far only needed by ES7000 platform
                         */
-                       if (platform_rename_gsi)
-                               irq = platform_rename_gsi(apic, irq);
+                       if (ioapic_renumber_irq)
+                               irq = ioapic_renumber_irq(apic, irq);
+
                        break;
                }
                default:

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 19bcb5dafd9b6e641ced6284408874514a50d716..3bff4a3aae6f5e851f4a83eb957fcd66c086f21c 100644 (file)
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -808,8 +808,6 @@ void __init find_smp_config (void)
                smp_scan_config(address, 0x400);
 }
 
-int (*platform_rename_gsi)(int ioapic, int gsi);
-
 /* --------------------------------------------------------------------------
                             ACPI-based MP Configuration
    -------------------------------------------------------------------------- */
@@ -1076,8 +1074,8 @@ void mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
 
        ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base;
 
-       if (platform_rename_gsi)
-               gsi = platform_rename_gsi(ioapic, gsi);
+       if (ioapic_renumber_irq)
+               gsi = ioapic_renumber_irq(ioapic, gsi);
 
        /* 
         * Avoid pin reprogramming.  PRTs typically include entries  

diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/i386/mach-es7000/es7000plat.c
index 0f494565763949deb6d2f3c18dff68ca5d63bf34..9707a9e45b46a29c7254f4eb70946c91dde01207 100644 (file)
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
@@ -139,7 +139,7 @@ parse_unisys_oem (char *oemptr, int oem_entries)
        } else {
                printk("\nEnabling ES7000 specific features...\n");
                es7000_plat = 1;
-               platform_rename_gsi = es7000_rename_gsi;
+               ioapic_renumber_irq = es7000_rename_gsi;
        }
        return es7000_plat;
 }

diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
index 60f2942f4588f923c92606574c622d843c107c14..9e5d4c8a21fa6b5db53aa57bdc58f86edd6cf7d9 100644 (file)
--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -162,8 +162,6 @@ static inline void check_acpi_pci(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) 

diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h
index a387a7f98459899fd1023e7d66cbc8d57f7dd522..4750335ef683fed4cbad5eff4f30aec709a867dc 100644 (file)
--- a/include/asm-i386/io_apic.h
+++ b/include/asm-i386/io_apic.h
@@ -204,6 +204,8 @@ extern int io_apic_get_redir_entries (int ioapic);
 extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low);
 #endif /*CONFIG_ACPI_BOOT*/
 
+extern int (*ioapic_renumber_irq)(int ioapic, int irq);
+
 #else  /* !CONFIG_X86_IO_APIC */
 #define io_apic_assign_pci_irqs 0
 #endif