提交 9da3b1ad 编写于 作者: A Al Viro 提交者: Linus Torvalds

[PATCH] misc ppc pt_regs fixes

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 28431146
...@@ -270,6 +270,6 @@ static void macio_adb_poll(void) ...@@ -270,6 +270,6 @@ static void macio_adb_poll(void)
local_irq_save(flags); local_irq_save(flags);
if (in_8(&adb->intr.r) != 0) if (in_8(&adb->intr.r) != 0)
macio_adb_interrupt(0, NULL, NULL); macio_adb_interrupt(0, NULL);
local_irq_restore(flags); local_irq_restore(flags);
} }
...@@ -1251,7 +1251,7 @@ static void mv643xx_netpoll(struct net_device *netdev) ...@@ -1251,7 +1251,7 @@ static void mv643xx_netpoll(struct net_device *netdev)
/* wait for previous write to complete */ /* wait for previous write to complete */
mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num)); mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num));
mv643xx_eth_int_handler(netdev->irq, netdev, NULL); mv643xx_eth_int_handler(netdev->irq, netdev);
mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL); mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册