Commit fbd04fca authored by David S. Miller's avatar David S. Miller

Merge nuts.ninka.net:/home/davem/src/BK/warning-2.5

into nuts.ninka.net:/home/davem/src/BK/warn-2.5
parents 461a50a3 7d05fc68
...@@ -548,7 +548,7 @@ int proc_ide_read_capacity ...@@ -548,7 +548,7 @@ int proc_ide_read_capacity
len = sprintf(page, "(none)\n"); len = sprintf(page, "(none)\n");
else else
len = sprintf(page,"%llu\n", len = sprintf(page,"%llu\n",
(u64) ((ide_driver_t *)drive->driver)->capacity(drive)); (long long) ((ide_driver_t *)drive->driver)->capacity(drive));
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
......
...@@ -271,7 +271,7 @@ u8 taskfile_dump_status (ide_drive_t *drive, const char *msg, u8 stat) ...@@ -271,7 +271,7 @@ u8 taskfile_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
hwif->OUTB(0x80, IDE_CONTROL_REG); hwif->OUTB(0x80, IDE_CONTROL_REG);
high = task_read_24(drive); high = task_read_24(drive);
sectors = ((u64)high << 24) | low; sectors = ((u64)high << 24) | low;
printk(", LBAsect=%lld", sectors); printk(", LBAsect=%lld", (long long) sectors);
} else { } else {
u8 cur = hwif->INB(IDE_SELECT_REG); u8 cur = hwif->INB(IDE_SELECT_REG);
u8 low = hwif->INB(IDE_LCYL_REG); u8 low = hwif->INB(IDE_LCYL_REG);
......
...@@ -567,7 +567,7 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat) ...@@ -567,7 +567,7 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
sectors = ((u64)high << 24) | low; sectors = ((u64)high << 24) | low;
printk(", LBAsect=%llu, high=%d, low=%d", printk(", LBAsect=%llu, high=%d, low=%d",
(u64) sectors, (long long) sectors,
high, low); high, low);
} else { } else {
u8 cur = hwif->INB(IDE_SELECT_REG); u8 cur = hwif->INB(IDE_SELECT_REG);
......
...@@ -1401,7 +1401,7 @@ ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch) ...@@ -1401,7 +1401,7 @@ ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
if (skb->len > 0) if (skb->len > 0)
/* note: a 0-length skb is used as an error indication */ /* note: a 0-length skb is used as an error indication */
++ppp->stats.rx_length_errors; ++ppp->stats.rx_length_errors;
err:
kfree_skb(skb); kfree_skb(skb);
ppp_receive_error(ppp); ppp_receive_error(ppp);
} }
......
...@@ -69,7 +69,7 @@ show_pools (struct device *dev, char *buf, size_t count, loff_t off) ...@@ -69,7 +69,7 @@ show_pools (struct device *dev, char *buf, size_t count, loff_t off)
} }
/* per-pool info, no real statistics yet */ /* per-pool info, no real statistics yet */
temp = snprintf (next, size, "%-16s %4u %4u %4u %2u\n", temp = snprintf (next, size, "%-16s %4u %4Zu %4Zu %2u\n",
pool->name, pool->name,
blocks, pages * pool->blocks_per_page, blocks, pages * pool->blocks_per_page,
pool->size, pages); pool->size, pages);
......
...@@ -591,7 +591,7 @@ static int visor_probe (struct usb_serial *serial) ...@@ -591,7 +591,7 @@ static int visor_probe (struct usb_serial *serial)
info("%s: port %d, is for %s use", serial->type->name, info("%s: port %d, is for %s use", serial->type->name,
connection_info->connections[i].port, string); connection_info->connections[i].port, string);
/* save off our num_ports info so that we can use it in the calc_num_ports call */ /* save off our num_ports info so that we can use it in the calc_num_ports call */
serial->private = (void *)num_ports; serial->private = (void *)(long)num_ports;
} }
} }
...@@ -637,7 +637,7 @@ static int visor_calc_num_ports (struct usb_serial *serial) ...@@ -637,7 +637,7 @@ static int visor_calc_num_ports (struct usb_serial *serial)
int num_ports = 0; int num_ports = 0;
if (serial->private) { if (serial->private) {
num_ports = (int)serial->private; num_ports = (int)(long)serial->private;
serial->private = NULL; serial->private = NULL;
} }
return num_ports; return num_ports;
......
...@@ -251,7 +251,7 @@ nfs_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res) ...@@ -251,7 +251,7 @@ nfs_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res)
hdrlen = (u8 *) p - (u8 *) iov->iov_base; hdrlen = (u8 *) p - (u8 *) iov->iov_base;
if (iov->iov_len < hdrlen) { if (iov->iov_len < hdrlen) {
printk(KERN_WARNING "NFS: READ reply header overflowed:" printk(KERN_WARNING "NFS: READ reply header overflowed:"
"length %d > %d\n", hdrlen, iov->iov_len); "length %d > %Zu\n", hdrlen, iov->iov_len);
return -errno_NFSERR_IO; return -errno_NFSERR_IO;
} else if (iov->iov_len != hdrlen) { } else if (iov->iov_len != hdrlen) {
dprintk("NFS: READ header is short. iovec will be shifted.\n"); dprintk("NFS: READ header is short. iovec will be shifted.\n");
...@@ -404,7 +404,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, u32 *p, void *dummy) ...@@ -404,7 +404,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, u32 *p, void *dummy)
hdrlen = (u8 *) p - (u8 *) iov->iov_base; hdrlen = (u8 *) p - (u8 *) iov->iov_base;
if (iov->iov_len < hdrlen) { if (iov->iov_len < hdrlen) {
printk(KERN_WARNING "NFS: READDIR reply header overflowed:" printk(KERN_WARNING "NFS: READDIR reply header overflowed:"
"length %d > %d\n", hdrlen, iov->iov_len); "length %d > %Zu\n", hdrlen, iov->iov_len);
return -errno_NFSERR_IO; return -errno_NFSERR_IO;
} else if (iov->iov_len != hdrlen) { } else if (iov->iov_len != hdrlen) {
dprintk("NFS: READDIR header is short. iovec will be shifted.\n"); dprintk("NFS: READDIR header is short. iovec will be shifted.\n");
......
...@@ -525,7 +525,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, u32 *p, struct nfs3_readdirres *res) ...@@ -525,7 +525,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, u32 *p, struct nfs3_readdirres *res)
hdrlen = (u8 *) p - (u8 *) iov->iov_base; hdrlen = (u8 *) p - (u8 *) iov->iov_base;
if (iov->iov_len < hdrlen) { if (iov->iov_len < hdrlen) {
printk(KERN_WARNING "NFS: READDIR reply header overflowed:" printk(KERN_WARNING "NFS: READDIR reply header overflowed:"
"length %d > %d\n", hdrlen, iov->iov_len); "length %d > %Zu\n", hdrlen, iov->iov_len);
return -errno_NFSERR_IO; return -errno_NFSERR_IO;
} else if (iov->iov_len != hdrlen) { } else if (iov->iov_len != hdrlen) {
dprintk("NFS: READDIR header is short. iovec will be shifted.\n"); dprintk("NFS: READDIR header is short. iovec will be shifted.\n");
...@@ -808,7 +808,7 @@ nfs3_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res) ...@@ -808,7 +808,7 @@ nfs3_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res)
hdrlen = (u8 *) p - (u8 *) iov->iov_base; hdrlen = (u8 *) p - (u8 *) iov->iov_base;
if (iov->iov_len < hdrlen) { if (iov->iov_len < hdrlen) {
printk(KERN_WARNING "NFS: READ reply header overflowed:" printk(KERN_WARNING "NFS: READ reply header overflowed:"
"length %d > %d\n", hdrlen, iov->iov_len); "length %d > %Zu\n", hdrlen, iov->iov_len);
return -errno_NFSERR_IO; return -errno_NFSERR_IO;
} else if (iov->iov_len != hdrlen) { } else if (iov->iov_len != hdrlen) {
dprintk("NFS: READ header is short. iovec will be shifted.\n"); dprintk("NFS: READ header is short. iovec will be shifted.\n");
......
...@@ -609,7 +609,7 @@ linvfs_get_block_core( ...@@ -609,7 +609,7 @@ linvfs_get_block_core(
if (blocks) { if (blocks) {
size = (pbmap.pbm_bsize - pbmap.pbm_delta); size = (pbmap.pbm_bsize - pbmap.pbm_delta);
bh_result->b_size = min(size, blocks << inode->i_blkbits); bh_result->b_size = min_t(ssize_t, size, blocks << inode->i_blkbits);
} }
return 0; return 0;
......
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