3 files changed, 1 insertions, 23 deletions

diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 459e50a424d1..90f97b4b9347 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -168,8 +168,6 @@ extern int save_ioapic_entries(void);
 extern void mask_ioapic_entries(void);
 extern int restore_ioapic_entries(void);
 
-extern int get_nr_irqs_gsi(void);
-
 extern void setup_ioapic_ids_from_mpc(void);
 extern void setup_ioapic_ids_from_mpc_nocheck(void);
 
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 3c17b25d159d..be3b5741badb 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3450,11 +3450,6 @@ static void __init probe_nr_irqs_gsi(void)
         printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
 }
 
-int get_nr_irqs_gsi(void)
-{
-        return nr_irqs_gsi;
-}
-
 unsigned int arch_dynirq_lower_bound(unsigned int from)
 {
         return from < nr_irqs_gsi ? nr_irqs_gsi : from;
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index dfa12a4a0a48..c919d3d5c845 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -390,22 +390,7 @@ static void xen_irq_init(unsigned irq)
 
 static int __must_check xen_allocate_irqs_dynamic(int nvec)
 {
-        int first = 0;
-        int i, irq;
-
-#ifdef CONFIG_X86_IO_APIC
-        /*
-         * For an HVM guest or domain 0 which see "real" (emulated or
-         * actual respectively) GSIs we allocate dynamic IRQs
-         * e.g. those corresponding to event channels or MSIs
-         * etc. from the range above those "real" GSIs to avoid
-         * collisions.
-         */
-        if (xen_initial_domain() || xen_hvm_domain())
-                first = get_nr_irqs_gsi();
-#endif
-
-        irq = irq_alloc_descs_from(first, nvec, -1);
+        int i, irq = irq_alloc_descs(-1, 0, nvec, -1);
 
         if (irq >= 0) {
                 for (i = 0; i < nvec; i++)