diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2009-07-28 14:26:59 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-09-10 01:33:20 -0400 |
commit | b90c062c65cc8839edfac39778a37a55ca9bda36 (patch) | |
tree | 4af45ff221747b10605eb5e043410d5e77aa477a /arch/x86/kvm | |
parent | 3b80fffe2b31fb716d3ebe729c54464ee7856723 (diff) |
KVM: MMU: fix bogus alloc_mmu_pages assignment
Remove the bogus n_free_mmu_pages assignment from alloc_mmu_pages.
It breaks accounting of mmu pages, since n_free_mmu_pages is modified
but the real number of pages remains the same.
Cc: stable@kernel.org
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/mmu.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 28be35c6ff1d..6f38178af926 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -2786,14 +2786,6 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu) | |||
2786 | 2786 | ||
2787 | ASSERT(vcpu); | 2787 | ASSERT(vcpu); |
2788 | 2788 | ||
2789 | spin_lock(&vcpu->kvm->mmu_lock); | ||
2790 | if (vcpu->kvm->arch.n_requested_mmu_pages) | ||
2791 | vcpu->kvm->arch.n_free_mmu_pages = | ||
2792 | vcpu->kvm->arch.n_requested_mmu_pages; | ||
2793 | else | ||
2794 | vcpu->kvm->arch.n_free_mmu_pages = | ||
2795 | vcpu->kvm->arch.n_alloc_mmu_pages; | ||
2796 | spin_unlock(&vcpu->kvm->mmu_lock); | ||
2797 | /* | 2789 | /* |
2798 | * When emulating 32-bit mode, cr3 is only 32 bits even on x86_64. | 2790 | * When emulating 32-bit mode, cr3 is only 32 bits even on x86_64. |
2799 | * Therefore we need to allocate shadow page tables in the first | 2791 | * Therefore we need to allocate shadow page tables in the first |