diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 04:23:53 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 04:23:53 +0300 |
| commit | 9e42d0cf5020aaf217433cad1a224745241d212a (patch) | |
| tree | 8d64537c600024a4220d1309873ac3467726c3b0 /drivers/block | |
| parent | 97c440ba41d4e7cddb8e14c7c7ec49dad2560709 (diff) | |
| parent | 18b8e08e290e9df588f51f5a7df50555f5a25664 (diff) | |
| download | linux-9e42d0cf5020aaf217433cad1a224745241d212a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Work around branch tracer warning.
sparc64: Fix unsigned long long warnings in drivers.
sparc64: Use unsigned long long for u64.
sparc: refactor code in fault_32.c
sparc64: refactor code in init_64.c
sparc64: refactor code in viohs.c
sparc: make proces_ver_nack a bit more readable
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/sunvdc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c index 953c0b83d758..5861e33efe63 100644 --- a/drivers/block/sunvdc.c +++ b/drivers/block/sunvdc.c @@ -153,7 +153,7 @@ static int vdc_send_attr(struct vio_driver_state *vio) pkt.vdisk_block_size = port->vdisk_block_size; pkt.max_xfer_size = port->max_xfer_size; - viodbg(HS, "SEND ATTR xfer_mode[0x%x] blksz[%u] max_xfer[%lu]\n", + viodbg(HS, "SEND ATTR xfer_mode[0x%x] blksz[%u] max_xfer[%llu]\n", pkt.xfer_mode, pkt.vdisk_block_size, pkt.max_xfer_size); return vio_ldc_send(&port->vio, &pkt, sizeof(pkt)); @@ -164,8 +164,8 @@ static int vdc_handle_attr(struct vio_driver_state *vio, void *arg) struct vdc_port *port = to_vdc_port(vio); struct vio_disk_attr_info *pkt = arg; - viodbg(HS, "GOT ATTR stype[0x%x] ops[%lx] disk_size[%lu] disk_type[%x] " - "xfer_mode[0x%x] blksz[%u] max_xfer[%lu]\n", + viodbg(HS, "GOT ATTR stype[0x%x] ops[%llx] disk_size[%llu] disk_type[%x] " + "xfer_mode[0x%x] blksz[%u] max_xfer[%llu]\n", pkt->tag.stype, pkt->operations, pkt->vdisk_size, pkt->vdisk_type, pkt->xfer_mode, pkt->vdisk_block_size, @@ -753,7 +753,7 @@ static int __devinit vdc_port_probe(struct vio_dev *vdev, err = -ENODEV; if ((vdev->dev_no << PARTITION_SHIFT) & ~(u64)MINORMASK) { - printk(KERN_ERR PFX "Port id [%lu] too large.\n", + printk(KERN_ERR PFX "Port id [%llu] too large.\n", vdev->dev_no); goto err_out_release_mdesc; } |