diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 18:20:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 18:20:40 -0500 |
commit | 3c6847eaa3da59f3bbe15eb3004ddab41ae6a201 (patch) | |
tree | 9a33b100efeaa63fab23662eb0db42385b8d1f10 /kernel/irq | |
parent | 37507717de51a8332a34ee07fd88700be88df5bf (diff) | |
parent | 4fe7ffb7e17ca6ad9173b8de35f260c9c8fc2f79 (diff) |
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irqchip updates from Ingo Molnar:
"Various irqchip driver updates, plus a genirq core update that allows
the initial spreading of irqs amonst CPUs without having to do it from
user-space"
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Fix null pointer reference in irq_set_affinity_hint()
irqchip: gic: Allow interrupt level to be set for PPIs
irqchip: mips-gic: Handle pending interrupts once in __gic_irq_dispatch()
irqchip: Conexant CX92755 interrupts controller driver
irqchip: Devicetree: document Conexant Digicolor irq binding
irqchip: omap-intc: Remove unused legacy interface for omap2
irqchip: omap-intc: Fix support for dm814 and dm816
irqchip: mtk-sysirq: Get irq number from register resource size
irqchip: renesas-intc-irqpin: r8a7779 IRLM setup support
genirq: Set initial affinity in irq_set_affinity_hint()
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/manage.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 80692373abd6..196a06fbc122 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -243,6 +243,9 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m) | |||
243 | return -EINVAL; | 243 | return -EINVAL; |
244 | desc->affinity_hint = m; | 244 | desc->affinity_hint = m; |
245 | irq_put_desc_unlock(desc, flags); | 245 | irq_put_desc_unlock(desc, flags); |
246 | /* set the initial affinity to prevent every interrupt being on CPU0 */ | ||
247 | if (m) | ||
248 | __irq_set_affinity(irq, m, false); | ||
246 | return 0; | 249 | return 0; |
247 | } | 250 | } |
248 | EXPORT_SYMBOL_GPL(irq_set_affinity_hint); | 251 | EXPORT_SYMBOL_GPL(irq_set_affinity_hint); |