diff options
| -rw-r--r-- | drivers/block/paride/pf.c | 4 | ||||
| -rw-r--r-- | drivers/net/3c59x.c | 4 | ||||
| -rw-r--r-- | fs/isofs/dir.c | 7 | ||||
| -rw-r--r-- | fs/jbd/journal.c | 2 | ||||
| -rw-r--r-- | include/linux/jbd.h | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c index a7e73e09d162..becf37efd5ec 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c @@ -369,11 +369,11 @@ static int pf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un return -EINVAL; capacity = get_capacity(pf->disk); if (capacity < PF_FD_MAX) { - g.cylinders = capacity / (PF_FD_HDS * PF_FD_SPT); + g.cylinders = sector_div(capacity, PF_FD_HDS * PF_FD_SPT); g.heads = PF_FD_HDS; g.sectors = PF_FD_SPT; } else { - g.cylinders = capacity / (PF_HD_HDS * PF_HD_SPT); + g.cylinders = sector_div(capacity, PF_HD_HDS * PF_HD_SPT); g.heads = PF_HD_HDS; g.sectors = PF_HD_SPT; } diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index b172b133b88c..47bf73b1fa1d 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c @@ -1803,7 +1803,7 @@ static void vortex_tx_timeout(struct net_device *dev) dev->name, inb(ioaddr + TxStatus), inw(ioaddr + EL3_STATUS)); EL3WINDOW(4); - printk(KERN_ERR " diagnostics: net %04x media %04x dma %08x fifo %04x\n", + printk(KERN_ERR " diagnostics: net %04x media %04x dma %08lx fifo %04x\n", inw(ioaddr + Wn4_NetDiag), inw(ioaddr + Wn4_Media), inl(ioaddr + PktStatus), @@ -2643,7 +2643,7 @@ dump_tx_ring(struct net_device *dev) vp->full_bus_master_tx, vp->dirty_tx, vp->dirty_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.8lx vs. %p.\n", inl(ioaddr + DownListPtr), &vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]); issue_and_wait(dev, DownStall); diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 7e7ff59c1095..1f2f92ab3466 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c @@ -254,11 +254,12 @@ static int isofs_readdir(struct file *filp, struct iso_directory_record * tmpde; struct inode *inode = filp->f_dentry->d_inode; - lock_kernel(); - tmpname = (char *) __get_free_page(GFP_KERNEL); - if (!tmpname) + tmpname = (char *)__get_free_page(GFP_KERNEL); + if (tmpname == NULL) return -ENOMEM; + + lock_kernel(); tmpde = (struct iso_directory_record *) (tmpname+1024); result = do_isofs_readdir(inode, filp, dirent, filldir, tmpname, tmpde); diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index aa7c3df83790..0fa6fcfe61b0 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -1526,7 +1526,7 @@ void shrink_journal_memory(void) * Simple support for retying memory allocations. Introduced to help to * debug different VM deadlock avoidance strategies. */ -void * __jbd_kmalloc (char *where, size_t size, int flags, int retry) +void * __jbd_kmalloc (const char *where, size_t size, int flags, int retry) { void *p; static unsigned long last_warning; diff --git a/include/linux/jbd.h b/include/linux/jbd.h index fafb868eec11..5b1657fca68a 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -54,7 +54,7 @@ extern int journal_enable_debug; #define jbd_debug(f, a...) /**/ #endif -extern void * __jbd_kmalloc (char *where, size_t size, int flags, int retry); +extern void * __jbd_kmalloc (const char *where, size_t size, int flags, int retry); #define jbd_kmalloc(size, flags) \ __jbd_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry) #define jbd_rep_kmalloc(size, flags) \ |