powerpc: Change u64/s64 to a long long integer type
Convert arch/powerpc/ over to long long based u64: -#ifdef __powerpc64__ -# include <asm-generic/int-l64.h> -#else -# include <asm-generic/int-ll64.h> -#endif +#include <asm-generic/int-ll64.h> This will avoid reoccuring spurious warnings in core kernel code that comes when people test on their own hardware. (i.e. x86 in ~98% of the cases) This is what x86 uses and it generally helps keep 64-bit code 32-bit clean too. [Adjusted to not impact user mode (from paulus) - sfr] Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
committed by
Benjamin Herrenschmidt
parent
66c721e184
commit
fe333321e2
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user