Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Thomas Gleixner and committed by
Ralf Baechle
1544129d 56eccc36

+8
+8
arch/mips/sibyte/sb1250/irq.c
··· 123 123 } 124 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 133 static void enable_sb1250_irq(struct irq_data *d) 127 134 { 128 135 unsigned int irq = d->irq; ··· 187 180 .name = "SB1250-IMR", 188 181 .irq_mask_ack = ack_sb1250_irq, 189 182 .irq_unmask = enable_sb1250_irq, 183 + .irq_mask = disable_sb1250_irq, 190 184 #ifdef CONFIG_SMP 191 185 .irq_set_affinity = sb1250_set_affinity 192 186 #endif