diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 05:53:01 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-07-20 18:12:11 -0400 |
commit | 1544129da2de9fa276429deed8fac3fbc45634be (patch) | |
tree | 79cb7d1115562caa39ecdd1666b37f9fda428a72 | |
parent | 56eccc36dd8888f44c1de24c52b150adbf8ec427 (diff) |
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>
-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 be4460a5f6a8..76ee045e2ce4 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, | |||
123 | } | 123 | } |
124 | #endif | 124 | #endif |
125 | 125 | ||
126 | static void disable_sb1250_irq(struct irq_data *d) | ||
127 | { | ||
128 | unsigned int irq = d->irq; | ||
129 | |||
130 | sb1250_mask_irq(sb1250_irq_owner[irq], irq); | ||
131 | } | ||
132 | |||
126 | static void enable_sb1250_irq(struct irq_data *d) | 133 | static void enable_sb1250_irq(struct irq_data *d) |
127 | { | 134 | { |
128 | unsigned int irq = d->irq; | 135 | unsigned int irq = d->irq; |
@@ -180,6 +187,7 @@ static struct irq_chip sb1250_irq_type = { | |||
180 | .name = "SB1250-IMR", | 187 | .name = "SB1250-IMR", |
181 | .irq_mask_ack = ack_sb1250_irq, | 188 | .irq_mask_ack = ack_sb1250_irq, |
182 | .irq_unmask = enable_sb1250_irq, | 189 | .irq_unmask = enable_sb1250_irq, |
190 | .irq_mask = disable_sb1250_irq, | ||
183 | #ifdef CONFIG_SMP | 191 | #ifdef CONFIG_SMP |
184 | .irq_set_affinity = sb1250_set_affinity | 192 | .irq_set_affinity = sb1250_set_affinity |
185 | #endif | 193 | #endif |