diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-14 02:37:30 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-14 02:37:30 +0400 |
| commit | 505608d2b9f3ab9e3ea0fd1b89b1cc560b91a7b5 (patch) | |
| tree | 1f7ff920409e0e510c4b36286b8f5bcba1e88086 /kernel | |
| parent | 0da273668657a70155f3d4ae121dc19277a05778 (diff) | |
| parent | 4de563ae821b1935b3c467a4606e5738b0b0df87 (diff) | |
| download | linux-505608d2b9f3ab9e3ea0fd1b89b1cc560b91a7b5.tar.xz | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/generic-chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index 10e663ab1f4a..452d6f2ba21d 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -275,7 +275,7 @@ int irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip, if (d->gc) return -EBUSY; - numchips = d->revmap_size / irqs_per_chip; + numchips = DIV_ROUND_UP(d->revmap_size, irqs_per_chip); if (!numchips) return -EINVAL; |