[PATCH] misc ppc pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
2843114699
commit
9da3b1ad7b
|
@ -270,6 +270,6 @@ static void macio_adb_poll(void)
|
|||
|
||||
local_irq_save(flags);
|
||||
if (in_8(&adb->intr.r) != 0)
|
||||
macio_adb_interrupt(0, NULL, NULL);
|
||||
macio_adb_interrupt(0, NULL);
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
|
|
@ -1251,7 +1251,7 @@ static void mv643xx_netpoll(struct net_device *netdev)
|
|||
/* wait for previous write to complete */
|
||||
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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue