From 38097ecfa48feea76272ce745cd8b3a1888469a7 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Thu, 1 Jul 2010 16:00:12 +0200 Subject: [PATCH] --- yaml --- r: 202385 b: refs/heads/master c: 5689cc53fa9d09b5bf41b1b1a7c90bd6c112ab40 h: refs/heads/master i: 202383: 6100da8cd23c2ac446a915e7e56210dcc7efe262 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/44x_tlb.c | 3 ++- trunk/include/linux/kvm_types.h | 4 ++-- trunk/virt/kvm/iommu.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f5f346755a82..f8b1249b3c4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 828554136bbacae6e39fc31b9cd7e7c660ad7530 +refs/heads/master: 5689cc53fa9d09b5bf41b1b1a7c90bd6c112ab40 diff --git a/trunk/arch/powerpc/kvm/44x_tlb.c b/trunk/arch/powerpc/kvm/44x_tlb.c index 812312542e50..9b9b5cdea840 100644 --- a/trunk/arch/powerpc/kvm/44x_tlb.c +++ b/trunk/arch/powerpc/kvm/44x_tlb.c @@ -316,7 +316,8 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr, gfn = gpaddr >> PAGE_SHIFT; new_page = gfn_to_page(vcpu->kvm, gfn); if (is_error_page(new_page)) { - printk(KERN_ERR "Couldn't get guest page for gfn %lx!\n", gfn); + printk(KERN_ERR "Couldn't get guest page for gfn %llx!\n", + (unsigned long long)gfn); kvm_release_page_clean(new_page); return; } diff --git a/trunk/include/linux/kvm_types.h b/trunk/include/linux/kvm_types.h index fb46efbeabec..7ac0d4eee430 100644 --- a/trunk/include/linux/kvm_types.h +++ b/trunk/include/linux/kvm_types.h @@ -32,11 +32,11 @@ typedef unsigned long gva_t; typedef u64 gpa_t; -typedef unsigned long gfn_t; +typedef u64 gfn_t; typedef unsigned long hva_t; typedef u64 hpa_t; -typedef unsigned long hfn_t; +typedef u64 hfn_t; typedef hfn_t pfn_t; diff --git a/trunk/virt/kvm/iommu.c b/trunk/virt/kvm/iommu.c index 779559552ce7..62a9caf0563c 100644 --- a/trunk/virt/kvm/iommu.c +++ b/trunk/virt/kvm/iommu.c @@ -108,7 +108,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot) get_order(page_size), flags); if (r) { printk(KERN_ERR "kvm_iommu_map_address:" - "iommu failed to map pfn=%lx\n", pfn); + "iommu failed to map pfn=%llx\n", pfn); goto unmap_pages; }