aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-03-10 11:08:14 -0500
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-10 14:48:44 -0500
commit6cb9bf3aaffcdd175574a9d66af4ad69156d0070 (patch)
tree056f459d31c6490961e132d438b672a2f8c9867a /drivers/xen
parent69c358ce377e998e3ababb494c2f8769dfb1715d (diff)
xen: events: do not workaround too-small nr_irqs
With the introduction of e7bcecb7b1d2 "genirq: Make nr_irqs runtime expandable" nr_irqs can grow as necessary to accommodate our allocation requests. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/events.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 6782251e4029..7c3668960c75 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -423,15 +423,8 @@ static int xen_allocate_irq_dynamic(void)
423 first = get_nr_irqs_gsi(); 423 first = get_nr_irqs_gsi();
424#endif 424#endif
425 425
426retry:
427 irq = irq_alloc_desc_from(first, -1); 426 irq = irq_alloc_desc_from(first, -1);
428 427
429 if (irq == -ENOMEM && first > NR_IRQS_LEGACY) {
430 printk(KERN_ERR "Out of dynamic IRQ space and eating into GSI space. You should increase nr_irqs\n");
431 first = max(NR_IRQS_LEGACY, first - NR_IRQS_LEGACY);
432 goto retry;
433 }
434
435 if (irq < 0) 428 if (irq < 0)
436 panic("No available IRQ to bind to: increase nr_irqs!\n"); 429 panic("No available IRQ to bind to: increase nr_irqs!\n");
437 430