mask_cache pointer also needs to be initialized for domain generic
chips.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselba...@gmail.com>
---
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Russell King - ARM Linux <li...@arm.linux.org.uk>
Cc: Grant Likely <grant.lik...@linaro.org>
Cc: Rob Herring <rob.herr...@calxeda.com>
Cc: Rob Landley <r...@landley.net>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: Jason Cooper <ja...@lakedaemon.net>
Cc: Andrew Lunn <and...@lunn.ch>
Cc: Jason Gunthorpe <jguntho...@obsidianresearch.com>
Cc: Thomas Petazzoni <thomas.petazz...@free-electrons.com>
Cc: Gregory Clement <gregory.clem...@free-electrons.com>
Cc: Ezequiel Garcia <ezequiel.gar...@free-electrons.com>
Cc: Maxime Ripard <maxime.rip...@free-electrons.com>
Cc: Jean-Francois Moine <moin...@free.fr>
Cc: Gerlando Falauto <gerlando.fala...@keymile.com>
Cc: Uwe Kleine-Koenig <u.kleine-koe...@pengutronix.de>
Cc: devicetree-disc...@lists.ozlabs.org
Cc: linux-...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
 kernel/irq/generic-chip.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c
index 3dbfe2e..3e0312f 100644
--- a/kernel/irq/generic-chip.c
+++ b/kernel/irq/generic-chip.c
@@ -275,12 +275,22 @@ int irq_alloc_domain_generic_chips(struct irq_domain *d, 
int irqs_per_chip,
 
        p += sizeof(*dgc) + numchips * sizeof(void *);
        for (i = 0; i < numchips; i++) {
+               int k;
+
                gc = (struct irq_chip_generic *)p;
                dgc->gc[i] = gc;
                irq_init_generic_chip(gc, name, num_ct, i * irqs_per_chip,
                                      NULL, handler);
                gc->domain = d;
 
+               for (k = 0; k < gc->num_ct; k++) {
+                       struct irq_chip_type *ct = &gc->chip_types[k];
+                       if (gcflags & IRQ_GC_MASK_CACHE_PER_TYPE)
+                               ct->mask_cache = &ct->mask_cache_priv;
+                       else
+                               ct->mask_cache = &gc->mask_cache;
+               }
+
                raw_spin_lock_irqsave(&gc_lock, flags);
                list_add_tail(&gc->list, &gc_list);
                raw_spin_unlock_irqrestore(&gc_lock, flags);
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to