Merge commit 'v2.6.29-rc2' into perfcounters/core

Conflicts:
	include/linux/syscalls.h

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 5c541f7850f9..74d07d137dae 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1061,7 +1061,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
         }
 
         sdev_printk(KERN_INFO, cmd->device,
-                    "aborting command. lun 0x%lx, tag 0x%lx\n",
+                    "aborting command. lun 0x%llx, tag 0x%llx\n",
                     (((u64) lun) << 48), (u64) found_evt);
 
         wait_for_completion(&evt->comp);
@@ -1082,7 +1082,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
         if (rsp_rc) {
                 if (printk_ratelimit())
                         sdev_printk(KERN_WARNING, cmd->device,
-                                    "abort code %d for task tag 0x%lx\n",
+                                    "abort code %d for task tag 0x%llx\n",
                                     rsp_rc, tsk_mgmt->task_tag);
                 return FAILED;
         }
@@ -1102,12 +1102,12 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
 
         if (found_evt == NULL) {
                 spin_unlock_irqrestore(hostdata->host->host_lock, flags);
-                sdev_printk(KERN_INFO, cmd->device, "aborted task tag 0x%lx completed\n",
+                sdev_printk(KERN_INFO, cmd->device, "aborted task tag 0x%llx completed\n",
                             tsk_mgmt->task_tag);
                 return SUCCESS;
         }
 
-        sdev_printk(KERN_INFO, cmd->device, "successfully aborted task tag 0x%lx\n",
+        sdev_printk(KERN_INFO, cmd->device, "successfully aborted task tag 0x%llx\n",
                     tsk_mgmt->task_tag);
 
         cmd->result = (DID_ABORT << 16);
@@ -1182,7 +1182,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
                 return FAILED;
         }
 
-        sdev_printk(KERN_INFO, cmd->device, "resetting device. lun 0x%lx\n",
+        sdev_printk(KERN_INFO, cmd->device, "resetting device. lun 0x%llx\n",
                     (((u64) lun) << 48));
 
         wait_for_completion(&evt->comp);
@@ -1203,7 +1203,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
         if (rsp_rc) {
                 if (printk_ratelimit())
                         sdev_printk(KERN_WARNING, cmd->device,
-                                    "reset code %d for task tag 0x%lx\n",
+                                    "reset code %d for task tag 0x%llx\n",
                                     rsp_rc, tsk_mgmt->task_tag);
                 return FAILED;
         }