Commit e300f70b authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller

[PATCH] misc fixes

- Revert the 3c59x.c compile warning fixes.  The return type of inl()
  was reverted back to the correct 32 bits.

- Fix an uninitialised timer in ext3 (JBD debug mode only) - run
  setup_ro_after() during initialisation.

- Fix ifdef/endif imbalance in JFS
parent b706cbf8
...@@ -1804,10 +1804,10 @@ static void vortex_tx_timeout(struct net_device *dev) ...@@ -1804,10 +1804,10 @@ static void vortex_tx_timeout(struct net_device *dev)
inw(ioaddr + EL3_STATUS)); inw(ioaddr + EL3_STATUS));
EL3WINDOW(4); EL3WINDOW(4);
printk(KERN_ERR " diagnostics: net %04x media %04x dma %08x fifo %04x\n", printk(KERN_ERR " diagnostics: net %04x media %04x dma %08x fifo %04x\n",
(unsigned)inw(ioaddr + Wn4_NetDiag), inw(ioaddr + Wn4_NetDiag),
(unsigned)inw(ioaddr + Wn4_Media), inw(ioaddr + Wn4_Media),
(unsigned)inl(ioaddr + PktStatus), inl(ioaddr + PktStatus),
(unsigned)inw(ioaddr + Wn4_FIFODiag)); inw(ioaddr + Wn4_FIFODiag));
/* Slight code bloat to be user friendly. */ /* Slight code bloat to be user friendly. */
if ((inb(ioaddr + TxStatus) & 0x88) == 0x88) if ((inb(ioaddr + TxStatus) & 0x88) == 0x88)
printk(KERN_ERR "%s: Transmitter encountered 16 collisions --" printk(KERN_ERR "%s: Transmitter encountered 16 collisions --"
...@@ -2644,7 +2644,7 @@ dump_tx_ring(struct net_device *dev) ...@@ -2644,7 +2644,7 @@ dump_tx_ring(struct net_device *dev)
vp->dirty_tx, vp->dirty_tx % TX_RING_SIZE, vp->dirty_tx, vp->dirty_tx % TX_RING_SIZE,
vp->cur_tx, vp->cur_tx % TX_RING_SIZE); vp->cur_tx, vp->cur_tx % TX_RING_SIZE);
printk(KERN_ERR " Transmit list %8.8x vs. %p.\n", printk(KERN_ERR " Transmit list %8.8x vs. %p.\n",
(unsigned)inl(ioaddr + DownListPtr), inl(ioaddr + DownListPtr),
&vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]); &vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]);
issue_and_wait(dev, DownStall); issue_and_wait(dev, DownStall);
for (i = 0; i < TX_RING_SIZE; i++) { for (i = 0; i < TX_RING_SIZE; i++) {
......
...@@ -1021,6 +1021,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) ...@@ -1021,6 +1021,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
sbi->s_mount_opt = 0; sbi->s_mount_opt = 0;
sbi->s_resuid = EXT3_DEF_RESUID; sbi->s_resuid = EXT3_DEF_RESUID;
sbi->s_resgid = EXT3_DEF_RESGID; sbi->s_resgid = EXT3_DEF_RESGID;
setup_ro_after(sb);
blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE); blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);
if (!blocksize) { if (!blocksize) {
......
...@@ -30,3 +30,4 @@ int jfs_init_acl(struct inode *, struct inode *); ...@@ -30,3 +30,4 @@ int jfs_init_acl(struct inode *, struct inode *);
int jfs_setattr(struct dentry *, struct iattr *); int jfs_setattr(struct dentry *, struct iattr *);
#endif /* CONFIG_JFS_POSIX_ACL */ #endif /* CONFIG_JFS_POSIX_ACL */
#endif /* _H_JFS_ACL */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment