Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -38,7 +38,6 @@
 #include <io_ports.h>
 #include <public/physdev.h>
 
-int (*ioapic_renumber_irq)(int ioapic, int irq);
 atomic_t irq_mis_count;
 
 /* Where if anywhere is the i8259 connect in external int mode */
@@ -877,13 +876,6 @@ static int pin_2_irq(int idx, int apic, 
         while (i < apic)
             irq += nr_ioapic_registers[i++];
         irq += pin;
-
-        /*
-         * For MPS mode, so far only needed by ES7000 platform
-         */
-        if (ioapic_renumber_irq)
-            irq = ioapic_renumber_irq(apic, irq);
-
         break;
     }
     default:
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -1116,9 +1116,6 @@ int mp_register_gsi (u32 gsi, int trigge
 
 	ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base;
 
-	if (ioapic_renumber_irq)
-		gsi = ioapic_renumber_irq(ioapic, gsi);
-
 	desc = irq_to_desc(gsi);
 	spin_lock_irqsave(&desc->lock, flags);
 	if (!(desc->status & IRQ_DISABLED) && desc->handler != &no_irq_type) {
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -195,7 +195,6 @@ extern int timer_uses_ioapic_pin_0;
 
 extern void init_ioapic_mappings(void);
 
-extern int (*ioapic_renumber_irq)(int ioapic, int irq);
 extern void ioapic_suspend(void);
 extern void ioapic_resume(void);