Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jul 2013 22:37:30 +0000 (15:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jul 2013 22:37:30 +0000 (15:37 -0700)
Pull irq updates from Thomas Gleixner:
 - core fix for missing round up in the generic irq chip implementation
 - new irq chip for MOXA SoCs
 - a few fixes and cleanups in the irqchip drivers

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: Add support for MOXA ART SoCs
  genirq: generic chip: Use DIV_ROUND_UP to calculate numchips
  irqchip: nvic: Fix wrong num_ct argument for irq_alloc_domain_generic_chips()
  irqchip: sun4i: Staticize sun4i_irq_ack()
  irqchip: vt8500: Staticize local symbols

1  2 
kernel/irq/generic-chip.c

index 10e663ab1f4aa0c88bc120660d824e50c099f9a2,2f274f30b7e2d9ab218798cf6e3da2050f07da0e..452d6f2ba21d9ae0b2b6cd1a966721b325ec9e23
@@@ -275,7 -275,10 +275,7 @@@ int irq_alloc_domain_generic_chips(stru
        if (d->gc)
                return -EBUSY;
  
-       numchips = d->revmap_size / irqs_per_chip;
 -      if (d->revmap_type != IRQ_DOMAIN_MAP_LINEAR)
 -              return -EINVAL;
 -
 -      numchips = DIV_ROUND_UP(d->revmap_data.linear.size, irqs_per_chip);
++      numchips = DIV_ROUND_UP(d->revmap_size, irqs_per_chip);
        if (!numchips)
                return -EINVAL;