diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-05-07 11:44:10 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-05-16 08:05:19 -0400 |
commit | d07c9f18756e8231909a9bbcbfa7502c60cbc810 (patch) | |
tree | f7d66979ff228b77c2f65bf1c477e1f92fed4a88 /drivers/xen/events/events_base.c | |
parent | be47be6c28a83dd8b3c5540d0be3675af1ac7b2e (diff) |
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>
Diffstat (limited to 'drivers/xen/events/events_base.c')
-rw-r--r-- | drivers/xen/events/events_base.c | 17 |
1 files changed, 1 insertions, 16 deletions
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) | |||
390 | 390 | ||
391 | static int __must_check xen_allocate_irqs_dynamic(int nvec) | 391 | static int __must_check xen_allocate_irqs_dynamic(int nvec) |
392 | { | 392 | { |
393 | int first = 0; | 393 | int i, irq = irq_alloc_descs(-1, 0, nvec, -1); |
394 | int i, irq; | ||
395 | |||
396 | #ifdef CONFIG_X86_IO_APIC | ||
397 | /* | ||
398 | * For an HVM guest or domain 0 which see "real" (emulated or | ||
399 | * actual respectively) GSIs we allocate dynamic IRQs | ||
400 | * e.g. those corresponding to event channels or MSIs | ||
401 | * etc. from the range above those "real" GSIs to avoid | ||
402 | * collisions. | ||
403 | */ | ||
404 | if (xen_initial_domain() || xen_hvm_domain()) | ||
405 | first = get_nr_irqs_gsi(); | ||
406 | #endif | ||
407 | |||
408 | irq = irq_alloc_descs_from(first, nvec, -1); | ||
409 | 394 | ||
410 | if (irq >= 0) { | 395 | if (irq >= 0) { |
411 | for (i = 0; i < nvec; i++) | 396 | for (i = 0; i < nvec; i++) |