Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  serial: Add 16850 uart type support to OF uart driver
  hvc_console: Remove tty->low_latency
  powerpc: Get the number of SLBs from "slb-size" property
  powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices
  powerpc/ps3: printing fixups for l64 to ll64 conversion drivers/video
  powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/scsi
  powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3
  powerpc/ps3: Printing fixups for l64 to ll64 conversion sound/ppc
  powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/char
  powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block
  powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc
  powerpc/ps3: ps3_repository_read_mm_info() takes u64 * arguments
  powerpc/ps3: clear_bit()/set_bit() operate on unsigned longs
  powerpc/ps3: The lv1_ routines have u64 parameters
  powerpc/ps3: Use dma_addr_t down through the stack
  powerpc/ps3: set_dabr() takes an unsigned long
  powerpc: Cleanup from l64 to ll64 change drivers/scsi

3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index ee0739b217b6..91ef669d98f6 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -933,7 +933,7 @@ static void ibmvfc_get_host_speed(struct Scsi_Host *shost)
                         fc_host_speed(shost) = FC_PORTSPEED_16GBIT;
                         break;
                 default:
-                        ibmvfc_log(vhost, 3, "Unknown port speed: %ld Gbit\n",
+                        ibmvfc_log(vhost, 3, "Unknown port speed: %lld Gbit\n",
                                    vhost->login_buf->resp.link_speed / 100);
                         fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;
                         break;
@@ -2149,8 +2149,8 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
 {
         const char *desc = ibmvfc_get_ae_desc(crq->event);
 
-        ibmvfc_log(vhost, 3, "%s event received. scsi_id: %lx, wwpn: %lx,"
-                   " node_name: %lx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
+        ibmvfc_log(vhost, 3, "%s event received. scsi_id: %llx, wwpn: %llx,"
+                   " node_name: %llx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
 
         switch (crq->event) {
         case IBMVFC_AE_LINK_UP:
@@ -2184,7 +2184,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
                 ibmvfc_link_down(vhost, IBMVFC_HALTED);
                 break;
         default:
-                dev_err(vhost->dev, "Unknown async event received: %ld\n", crq->event);
+                dev_err(vhost->dev, "Unknown async event received: %lld\n", crq->event);
                 break;
         };
 }
@@ -2261,13 +2261,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost)
          * actually sent
          */
         if (unlikely(!ibmvfc_valid_event(&vhost->pool, evt))) {
-                dev_err(vhost->dev, "Returned correlation_token 0x%08lx is invalid!\n",
+                dev_err(vhost->dev, "Returned correlation_token 0x%08llx is invalid!\n",
                         crq->ioba);
                 return;
         }
 
         if (unlikely(atomic_read(&evt->free))) {
-                dev_err(vhost->dev, "Received duplicate correlation_token 0x%08lx!\n",
+                dev_err(vhost->dev, "Received duplicate correlation_token 0x%08llx!\n",
                         crq->ioba);
                 return;
         }
@@ -3259,7 +3259,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)
 
         tgt = mempool_alloc(vhost->tgt_pool, GFP_KERNEL);
         if (!tgt) {
-                dev_err(vhost->dev, "Target allocation failure for scsi id %08lx\n",
+                dev_err(vhost->dev, "Target allocation failure for scsi id %08llx\n",
                         scsi_id);
                 return -ENOMEM;
         }
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index babdf3db59df..87dafd0f8d44 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -691,13 +691,13 @@ struct ibmvfc_host {
 #define DBG_CMD(CMD) do { if (ibmvfc_debug) CMD; } while (0)
 
 #define tgt_dbg(t, fmt, ...)                    \
-        DBG_CMD(dev_info((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__))
+        DBG_CMD(dev_info((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__))
 
 #define tgt_info(t, fmt, ...)           \
-        dev_info((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
+        dev_info((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
 
 #define tgt_err(t, fmt, ...)            \
-        dev_err((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
+        dev_err((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
 
 #define ibmvfc_dbg(vhost, ...) \
         DBG_CMD(dev_info((vhost)->dev, ##__VA_ARGS__))
diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c
index ce48e2d0193c..ca0dd33497ec 100644
--- a/drivers/scsi/ps3rom.c
+++ b/drivers/scsi/ps3rom.c
@@ -290,11 +290,11 @@ static irqreturn_t ps3rom_interrupt(int irq, void *data)
 
         if (tag != dev->tag)
                 dev_err(&dev->sbd.core,
-                        "%s:%u: tag mismatch, got %lx, expected %lx\n",
+                        "%s:%u: tag mismatch, got %llx, expected %llx\n",
                         __func__, __LINE__, tag, dev->tag);
 
         if (res) {
-                dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%lx\n",
+                dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%llx\n",
                         __func__, __LINE__, res, status);
                 return IRQ_HANDLED;
         }
@@ -364,7 +364,7 @@ static int __devinit ps3rom_probe(struct ps3_system_bus_device *_dev)
 
         if (dev->blk_size != CD_FRAMESIZE) {
                 dev_err(&dev->sbd.core,
-                        "%s:%u: cannot handle block size %lu\n", __func__,
+                        "%s:%u: cannot handle block size %llu\n", __func__,
                         __LINE__, dev->blk_size);
                 return -EINVAL;
         }