From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Fix printk formats in ia64/kvm:
arch/ia64/kvm/kvm-ia64.c:250: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'uint64_t'
arch/ia64/kvm/kvm-ia64.c:774: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'uint64_t'
arch/ia64/kvm/kvm_fw.c:151: warning: format '%ld' expects type 'long int', but argument 3 has type 's64'
arch/ia64/kvm/kvm_fw.c:151: warning: format '%lx' expects type 'long unsigned int', but argument 4 has type 'u64'
arch/ia64/kvm/kvm_fw.c:151: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'u64'
arch/ia64/kvm/kvm_fw.c:548: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'u64'
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
arch/ia64/kvm/kvm-ia64.c | 4 ++--
arch/ia64/kvm/kvm_fw.c | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
--- linux-next-20091014.orig/arch/ia64/kvm/kvm-ia64.c
+++ linux-next-20091014/arch/ia64/kvm/kvm-ia64.c
@@ -247,7 +247,7 @@ mmio:
r = kvm_io_bus_write(&vcpu->kvm->mmio_bus, p->addr,
p->size, &p->data);
if (r)
- printk(KERN_ERR"kvm: No iodevice found! addr:%lx\n", p->addr);
+ printk(KERN_ERR "kvm: No iodevice found! addr:%llx\n", p->addr);
p->state = STATE_IORESP_READY;
return 1;
@@ -771,7 +771,7 @@ static struct kvm *kvm_alloc_kvm(void)
kvm = (struct kvm *)(vm_base +
offsetof(struct kvm_vm_data, kvm_vm_struct));
kvm->arch.vm_base = vm_base;
- printk(KERN_DEBUG"kvm: vm's data area:0x%lx\n", vm_base);
+ printk(KERN_DEBUG "kvm: vm's data area:0x%llx\n", vm_base);
return kvm;
}
--- linux-next-20091014.orig/arch/ia64/kvm/kvm_fw.c
+++ linux-next-20091014/arch/ia64/kvm/kvm_fw.c
@@ -146,9 +146,10 @@ static struct ia64_pal_retval pal_cache_
&result.v0);
local_irq_restore(psr);
if (result.status != 0)
- printk(KERN_ERR"vcpu:%p crashed due to cache_flush err:%ld"
+ printk(KERN_ERR "vcpu:%p crashed due to cache_flush err:%ld"
"in1:%lx,in2:%lx\n",
- vcpu, result.status, gr29, gr30);
+ vcpu, (long)result.status,
+ (unsigned long)gr29, (unsigned long)gr30);
#if 0
if (gr29 == PAL_CACHE_TYPE_COHERENT) {
@@ -544,8 +545,8 @@ int kvm_pal_emul(struct kvm_vcpu *vcpu,
break;
default:
INIT_PAL_STATUS_UNIMPLEMENTED(result);
- printk(KERN_WARNING"kvm: Unsupported pal call,"
- " index:0x%lx\n", gr28);
+ printk(KERN_WARNING "kvm: Unsupported pal call,"
+ " index:0x%lx\n", (unsigned long)gr28);
}
set_pal_result(vcpu, result);
return ret;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
