Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] mpc52xx_pic: fix main interrupt masking
This commit is contained in:
commit
80584ff3b9
1 changed files with 2 additions and 2 deletions
|
@ -128,7 +128,7 @@ static void mpc52xx_main_mask(unsigned int virq)
|
||||||
|
|
||||||
pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
|
pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
|
||||||
|
|
||||||
io_be_setbit(&intr->main_mask, 15 - l2irq);
|
io_be_setbit(&intr->main_mask, 16 - l2irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mpc52xx_main_unmask(unsigned int virq)
|
static void mpc52xx_main_unmask(unsigned int virq)
|
||||||
|
@ -141,7 +141,7 @@ static void mpc52xx_main_unmask(unsigned int virq)
|
||||||
|
|
||||||
pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
|
pr_debug("%s: irq=%x. l2=%d\n", __func__, irq, l2irq);
|
||||||
|
|
||||||
io_be_clrbit(&intr->main_mask, 15 - l2irq);
|
io_be_clrbit(&intr->main_mask, 16 - l2irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irq_chip mpc52xx_main_irqchip = {
|
static struct irq_chip mpc52xx_main_irqchip = {
|
||||||
|
|
Loading…
Reference in a new issue