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

Commit 9da3b1ad authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] misc ppc pt_regs fixes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 28431146

drivers/macintosh/macio-adb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

}
 
}

drivers/net/mv643xx_eth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

}

}