evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: xen: Sanitise sparse_irq handling

Browse source 
There seems to be more cleanups possible, but that's left to the xen
experts :)

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
This commit is contained in:
Thomas Gleixner 2010-09-29 17:37:10 +02:00
parent ad9f43340f
commit 77dff1c755
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/xen/events.c
View file

@ -338,30 +338,29 @@ static void unmask_evtchn(int port)
static int find_unbound_irq(void) static int find_unbound_irq(void)
{ {
int irq; struct irq_data *data;
struct irq_desc *desc; int irq, res;
for (irq = 0; irq < nr_irqs; irq++) { for (irq = 0; irq < nr_irqs; irq++) {
desc = irq_to_desc(irq); data = irq_get_irq_data(irq);
/* only 0->15 have init'd desc; handle irq > 16 */ /* only 0->15 have init'd desc; handle irq > 16 */
if (desc == NULL) if (!data)
break; break;
if (desc->chip == &no_irq_chip) if (data->chip == &no_irq_chip)
break; break;
if (desc->chip != &xen_dynamic_chip) if (data->chip != &xen_dynamic_chip)
continue; continue;
if (irq_info[irq].type == IRQT_UNBOUND) if (irq_info[irq].type == IRQT_UNBOUND)
break; return irq;
} }
if (irq == nr_irqs) if (irq == nr_irqs)
panic("No available IRQ to bind to: increase nr_irqs!\n"); panic("No available IRQ to bind to: increase nr_irqs!\n");
desc = irq_to_desc_alloc_node(irq, 0); res = irq_alloc_desc_at(irq, 0);
if (WARN_ON(desc == NULL))
return -1;
dynamic_irq_init_keep_chip_data(irq); if (WARN_ON(res != irq))
return -1;
return irq; return irq;
} }
@ -495,7 +494,7 @@ static void unbind_from_irq(unsigned int irq)
if (irq_info[irq].type != IRQT_UNBOUND) { if (irq_info[irq].type != IRQT_UNBOUND) {
irq_info[irq] = mk_unbound_info(); irq_info[irq] = mk_unbound_info();
dynamic_irq_cleanup(irq); irq_free_desc(irq);
} }
spin_unlock(&irq_mapping_update_lock); spin_unlock(&irq_mapping_update_lock);