diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 11:53:01 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2011-07-20 23:12:11 +0100 |
| commit | 1544129da2de9fa276429deed8fac3fbc45634be (patch) | |
| tree | 79cb7d1115562caa39ecdd1666b37f9fda428a72 /arch/mips | |
| parent | 56eccc36dd8888f44c1de24c52b150adbf8ec427 (diff) | |
| download | linux-3.10-1544129da2de9fa276429deed8fac3fbc45634be.tar.gz linux-3.10-1544129da2de9fa276429deed8fac3fbc45634be.tar.bz2 linux-3.10-1544129da2de9fa276429deed8fac3fbc45634be.zip | |
MIPS: SB1250: Restore dropped irq_mask function
Commit d6d5d5c4a (MIPS: Sibyte: Convert to new irq_chip functions)
removed the mask function which breaks irq_shutdown(). Restore it.
Reported-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2460/
Tested-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/sibyte/sb1250/irq.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index be4460a5f6a..76ee045e2ce 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c @@ -123,6 +123,13 @@ static int sb1250_set_affinity(struct irq_data *d, const struct cpumask *mask, } #endif +static void disable_sb1250_irq(struct irq_data *d) +{ + unsigned int irq = d->irq; + + sb1250_mask_irq(sb1250_irq_owner[irq], irq); +} + static void enable_sb1250_irq(struct irq_data *d) { unsigned int irq = d->irq; @@ -180,6 +187,7 @@ static struct irq_chip sb1250_irq_type = { .name = "SB1250-IMR", .irq_mask_ack = ack_sb1250_irq, .irq_unmask = enable_sb1250_irq, + .irq_mask = disable_sb1250_irq, #ifdef CONFIG_SMP .irq_set_affinity = sb1250_set_affinity #endif |