x86: Get rid of get_nr_irqs_gsi()

No need to expose this outside of the ioapic code. The dynamic
allocations are guaranteed not to happen in the gsi space. See commit
62a08ae2a.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Grant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: x86@kernel.org
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/20140507154335.959870037@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 459e50a424d148eb94163a343cbf17a8b4abfad9..90f97b4b93476e319438ba93d2c72e2f8b1adc24 100644 (file)
--- 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 3c17b25d159dec4553adbaf004faf82c3fe91b71..be3b5741badb5bde5bf7892606c816bd307234c4 100644 (file)
--- 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 dfa12a4a0a48ffbaea7f64e4b0c95e6b2ca38932..c919d3d5c8458742aabb2963624f541004e8df18 100644 (file)
--- 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++)