Skip to content

Commit

Permalink
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…
Browse files Browse the repository at this point in the history
…/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] mpc52xx_pic: fix main interrupt masking
  • Loading branch information
Linus Torvalds committed Apr 11, 2007
2 parents 73aba63 + 2213217 commit 80584ff
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/52xx/mpc52xx_pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ static void mpc52xx_main_mask(unsigned int virq)

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)
Expand All @@ -141,7 +141,7 @@ static void mpc52xx_main_unmask(unsigned int virq)

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 = {
Expand Down

0 comments on commit 80584ff

Please sign in to comment.