tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] misc ppc pt_regs fixes

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Al Viro and committed by
Linus Torvalds 9da3b1ad 28431146

+2 -2
+1 -1
drivers/macintosh/macio-adb.c
··· 270 270 271 271 local_irq_save(flags); 272 272 if (in_8(&adb->intr.r) != 0) 273 - macio_adb_interrupt(0, NULL, NULL); 273 + macio_adb_interrupt(0, NULL); 274 274 local_irq_restore(flags); 275 275 }
+1 -1
drivers/net/mv643xx_eth.c
··· 1251 1251 /* wait for previous write to complete */ 1252 1252 mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num)); 1253 1253 1254 - mv643xx_eth_int_handler(netdev->irq, netdev, NULL); 1254 + mv643xx_eth_int_handler(netdev->irq, netdev); 1255 1255 1256 1256 mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL); 1257 1257 }