aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp>2015-11-20 03:42:23 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2015-11-25 11:26:03 -0500
commit7ee0e5b29d275ac299cdf8ef67e60bf1648c8c6a (patch)
tree53213becd9cbcf524ac241099bb94110c4d87c0f
parent018aabb56d6109c8f12397c24e59f67c58870ac1 (diff)
KVM: x86: MMU: Remove unused parameter of __direct_map()
Signed-off-by: Takuya Yoshikawa <yoshikawa_takuya_b1@lab.ntt.co.jp> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/kvm/mmu.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index d9a6801457aa..8a1593f985df 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2708,9 +2708,8 @@ static void direct_pte_prefetch(struct kvm_vcpu *vcpu, u64 *sptep)
2708 __direct_pte_prefetch(vcpu, sp, sptep); 2708 __direct_pte_prefetch(vcpu, sp, sptep);
2709} 2709}
2710 2710
2711static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write, 2711static int __direct_map(struct kvm_vcpu *vcpu, int write, int map_writable,
2712 int map_writable, int level, gfn_t gfn, pfn_t pfn, 2712 int level, gfn_t gfn, pfn_t pfn, bool prefault)
2713 bool prefault)
2714{ 2713{
2715 struct kvm_shadow_walk_iterator iterator; 2714 struct kvm_shadow_walk_iterator iterator;
2716 struct kvm_mmu_page *sp; 2715 struct kvm_mmu_page *sp;
@@ -3018,11 +3017,9 @@ static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, u32 error_code,
3018 make_mmu_pages_available(vcpu); 3017 make_mmu_pages_available(vcpu);
3019 if (likely(!force_pt_level)) 3018 if (likely(!force_pt_level))
3020 transparent_hugepage_adjust(vcpu, &gfn, &pfn, &level); 3019 transparent_hugepage_adjust(vcpu, &gfn, &pfn, &level);
3021 r = __direct_map(vcpu, v, write, map_writable, level, gfn, pfn, 3020 r = __direct_map(vcpu, write, map_writable, level, gfn, pfn, prefault);
3022 prefault);
3023 spin_unlock(&vcpu->kvm->mmu_lock); 3021 spin_unlock(&vcpu->kvm->mmu_lock);
3024 3022
3025
3026 return r; 3023 return r;
3027 3024
3028out_unlock: 3025out_unlock:
@@ -3531,8 +3528,7 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code,
3531 make_mmu_pages_available(vcpu); 3528 make_mmu_pages_available(vcpu);
3532 if (likely(!force_pt_level)) 3529 if (likely(!force_pt_level))
3533 transparent_hugepage_adjust(vcpu, &gfn, &pfn, &level); 3530 transparent_hugepage_adjust(vcpu, &gfn, &pfn, &level);
3534 r = __direct_map(vcpu, gpa, write, map_writable, 3531 r = __direct_map(vcpu, write, map_writable, level, gfn, pfn, prefault);
3535 level, gfn, pfn, prefault);
3536 spin_unlock(&vcpu->kvm->mmu_lock); 3532 spin_unlock(&vcpu->kvm->mmu_lock);
3537 3533
3538 return r; 3534 return r;