Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80584ff3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 73aba63c 22132178

arch/powerpc/platforms/52xx/mpc52xx_pic.c

+2 −2
Original line number Diff line number Diff line
@@ -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)
@@ -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 = {