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

4 files changed, 10 insertions, 10 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;
         }
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 8859aeac2d25..9b3e09cd41f9 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -482,7 +482,7 @@ static void n2rng_dump_test_buffer(struct n2rng *np)
         int i;
 
         for (i = 0; i < SELFTEST_BUFFER_WORDS; i++)
-                dev_err(&np->op->dev, "Test buffer slot %d [0x%016lx]\n",
+                dev_err(&np->op->dev, "Test buffer slot %d [0x%016llx]\n",
                         i, np->test_buffer[i]);
 }
 
diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c
index 233f1cda36e5..611230fef2b6 100644
--- a/drivers/net/sunvnet.c
+++ b/drivers/net/sunvnet.c
@@ -336,7 +336,7 @@ static int vnet_walk_rx_one(struct vnet_port *port,
         if (IS_ERR(desc))
                 return PTR_ERR(desc);
 
-        viodbg(DATA, "vio_walk_rx_one desc[%02x:%02x:%08x:%08x:%lx:%lx]\n",
+        viodbg(DATA, "vio_walk_rx_one desc[%02x:%02x:%08x:%08x:%llx:%llx]\n",
                desc->hdr.state, desc->hdr.ack,
                desc->size, desc->ncookies,
                desc->cookies[0].cookie_addr,
@@ -394,14 +394,14 @@ static int vnet_rx(struct vnet_port *port, void *msgbuf)
         struct vio_dring_state *dr = &port->vio.drings[VIO_DRIVER_RX_RING];
         struct vio_driver_state *vio = &port->vio;
 
-        viodbg(DATA, "vnet_rx stype_env[%04x] seq[%016lx] rcv_nxt[%016lx]\n",
+        viodbg(DATA, "vnet_rx stype_env[%04x] seq[%016llx] rcv_nxt[%016llx]\n",
                pkt->tag.stype_env, pkt->seq, dr->rcv_nxt);
 
         if (unlikely(pkt->tag.stype_env != VIO_DRING_DATA))
                 return 0;
         if (unlikely(pkt->seq != dr->rcv_nxt)) {
-                printk(KERN_ERR PFX "RX out of sequence seq[0x%lx] "
-                       "rcv_nxt[0x%lx]\n", pkt->seq, dr->rcv_nxt);
+                printk(KERN_ERR PFX "RX out of sequence seq[0x%llx] "
+                       "rcv_nxt[0x%llx]\n", pkt->seq, dr->rcv_nxt);
                 return 0;
         }
 
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 2550af4ae432..4431578d8c45 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -214,7 +214,7 @@ static int __devinit d7s_probe(struct of_device *op,
 
         writeb(regs,  p->regs);
 
-        printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%lx] %s\n", 
+        printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%llx] %s\n",
                op->node->full_name,
                (regs & D7S_FLIP) ? " (FLIPPED)" : "",
                op->resource[0].start,