Merge master.kernel.org:/home/davem/BK/warn-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/ide/ide-proc.c

@@ -548,7 +548,7 @@ int proc_ide_read_capacity
 		len = sprintf(page, "(none)\n");
         else
 		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);
 }
 

drivers/ide/ide-taskfile.c

@@ -271,7 +271,7 @@ u8 taskfile_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
 				hwif->OUTB(0x80, IDE_CONTROL_REG);
 				high = task_read_24(drive);
 				sectors = ((u64)high << 24) | low;
-				printk(", LBAsect=%lld", sectors);
+				printk(", LBAsect=%lld", (long long) sectors);
 			} else {
 				u8 cur  = hwif->INB(IDE_SELECT_REG);
 				u8 low  = hwif->INB(IDE_LCYL_REG);

drivers/ide/ide.c

@@ -567,7 +567,7 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
 
 					sectors = ((u64)high << 24) | low;
 					printk(", LBAsect=%llu, high=%d, low=%d",
-					       (u64) sectors,
+					       (long long) sectors,
 					       high, low);
 				} else {
 					u8 cur = hwif->INB(IDE_SELECT_REG);

drivers/ieee1394/dv1394.c

@@ -170,15 +170,6 @@ static spinlock_t dv1394_cards_lock = SPIN_LOCK_UNLOCKED;
 
 static struct hpsb_highlevel *hl_handle; /* = NULL; */
 
-static LIST_HEAD(dv1394_devfs);
-struct dv1394_devfs_entry {
-	struct list_head list;
-    devfs_handle_t devfs;
-	char name[32];
-	struct dv1394_devfs_entry *parent;
-};
-static spinlock_t dv1394_devfs_lock = SPIN_LOCK_UNLOCKED;
-
 /* translate from a struct file* to the corresponding struct video_card* */
 
 static inline struct video_card* file_to_video_card(struct file *file)
@@ -2564,6 +2555,17 @@ static struct file_operations dv1394_fops=
 
 /*** DEVFS HELPERS *********************************************************/
 
+#ifdef CONFIG_DEVFS_FS
+
+static LIST_HEAD(dv1394_devfs);
+struct dv1394_devfs_entry {
+	struct list_head list;
+    devfs_handle_t devfs;
+	char name[32];
+	struct dv1394_devfs_entry *parent;
+};
+static spinlock_t dv1394_devfs_lock = SPIN_LOCK_UNLOCKED;
+
 struct dv1394_devfs_entry *
 dv1394_devfs_find( char *name)
 {
@@ -2693,6 +2695,7 @@ void dv1394_devfs_del( char *name)
 		kfree(p);
 	}
 }
+#endif /* CONFIG_DEVFS */
 
 /*** IEEE1394 HPSB CALLBACKS ***********************************************/
 
@@ -2851,7 +2854,6 @@ static void dv1394_add_host (struct hpsb_host *host)
 {
 	struct ti_ohci *ohci;
 	char buf[16];
-	struct dv1394_devfs_entry *devfs_entry;
 
 	/* We only work with the OHCI-1394 driver */
 	if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME))
@@ -2873,6 +2875,8 @@ static void dv1394_add_host (struct hpsb_host *host)
 #endif
 
 #ifdef CONFIG_DEVFS_FS
+{
+	struct dv1394_devfs_entry *devfs_entry;
 	devfs_entry = dv1394_devfs_find("dv");
 	if (devfs_entry != NULL) {
 		snprintf(buf, sizeof(buf), "host%d", ohci->id);
@@ -2880,6 +2884,7 @@ static void dv1394_add_host (struct hpsb_host *host)
 		dv1394_devfs_add_dir("NTSC", devfs_entry, NULL);
 		dv1394_devfs_add_dir("PAL", devfs_entry, NULL);
 	}
+}
 #endif
 	
 	dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE);

drivers/net/ppp_generic.c

@@ -1401,7 +1401,7 @@ ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
 	if (skb->len > 0)
 		/* note: a 0-length skb is used as an error indication */
 		++ppp->stats.rx_length_errors;
-err:
+
 	kfree_skb(skb);
 	ppp_receive_error(ppp);
 }

drivers/pci/pool.c

@@ -69,7 +69,7 @@ show_pools (struct device *dev, char *buf, size_t count, loff_t off)
 		}
 
 		/* 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,
 				blocks, pages * pool->blocks_per_page,
 				pool->size, pages);

drivers/usb/serial/visor.c

@@ -591,7 +591,7 @@ static int visor_probe (struct usb_serial *serial)
 			info("%s: port %d, is for %s use", serial->type->name,
 			     connection_info->connections[i].port, string);
 		/* 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)
 	int num_ports = 0;
 
 	if (serial->private) {
-		num_ports = (int)serial->private;
+		num_ports = (int)(long)serial->private;
 		serial->private = NULL;
 	}
 	return num_ports;

fs/nfs/nfs2xdr.c

@@ -251,7 +251,7 @@ nfs_xdr_readres(struct rpc_rqst *req, u32 *p, struct nfs_readres *res)
 	hdrlen = (u8 *) p - (u8 *) iov->iov_base;
 	if (iov->iov_len < hdrlen) {
 		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;
 	} else if (iov->iov_len != hdrlen) {
 		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)
 	hdrlen = (u8 *) p - (u8 *) iov->iov_base;
 	if (iov->iov_len < hdrlen) {
 		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;
 	} else if (iov->iov_len != hdrlen) {
 		dprintk("NFS: READDIR header is short. iovec will be shifted.\n");

fs/nfs/nfs3xdr.c

@@ -525,7 +525,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, u32 *p, struct nfs3_readdirres *res)
 	hdrlen = (u8 *) p - (u8 *) iov->iov_base;
 	if (iov->iov_len < hdrlen) {
 		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;
 	} else if (iov->iov_len != hdrlen) {
 		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)
 	hdrlen = (u8 *) p - (u8 *) iov->iov_base;
 	if (iov->iov_len < hdrlen) {
 		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;
 	} else if (iov->iov_len != hdrlen) {
 		dprintk("NFS: READ header is short. iovec will be shifted.\n");

fs/xfs/linux/xfs_aops.c

@@ -609,7 +609,7 @@ linvfs_get_block_core(
 
 	if (blocks) {
 		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;

kernel/pid.c

@@ -77,7 +77,7 @@ static inline pidmap_t *next_free_map(pidmap_t *map, int *max_steps)
 			 * Free the page if someone raced with us
 			 * installing it:
 			 */
-			if (cmpxchg(&map->page, NULL, page))
+			if (cmpxchg(&map->page, NULL, (void *) page))
 				free_page(page);
 			if (!map->page)
 				break;