Skip to content

L
linux-davinci-2.6.23
Commit 4b02d6da authored by Avi Kivity's avatar Avi Kivity
Browse files
Options

KVM: MMU: Simplify kvm_mmu_free_page() a tiny bit 

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 2dc7094b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
drivers/kvm/mmu.c
View file @ 4b02d6da
...@@ -455,12 +455,10 @@ static int is_empty_shadow_page(hpa_t page_hpa) ...@@ -455,12 +455,10 @@ static int is_empty_shadow_page(hpa_t page_hpa)
} }
#endif #endif
static void kvm_mmu_free_page(struct kvm_vcpu *vcpu, hpa_t page_hpa) static void kvm_mmu_free_page(struct kvm_vcpu *vcpu,
struct kvm_mmu_page *page_head)
{ {
struct kvm_mmu_page *page_head = page_header(page_hpa); ASSERT(is_empty_shadow_page(page_head->page_hpa));
ASSERT(is_empty_shadow_page(page_hpa));
page_head->page_hpa = page_hpa;
list_move(&page_head->link, &vcpu->free_pages); list_move(&page_head->link, &vcpu->free_pages);
++vcpu->kvm->n_free_mmu_pages; ++vcpu->kvm->n_free_mmu_pages;
} }
...@@ -690,7 +688,7 @@ static void kvm_mmu_zap_page(struct kvm_vcpu *vcpu, ...@@ -690,7 +688,7 @@ static void kvm_mmu_zap_page(struct kvm_vcpu *vcpu,
kvm_mmu_page_unlink_children(vcpu, page); kvm_mmu_page_unlink_children(vcpu, page);
if (!page->root_count) { if (!page->root_count) {
hlist_del(&page->hash_link); hlist_del(&page->hash_link);
kvm_mmu_free_page(vcpu, page->page_hpa); kvm_mmu_free_page(vcpu, page);
} else } else
list_move(&page->link, &vcpu->kvm->active_mmu_pages); list_move(&page->link, &vcpu->kvm->active_mmu_pages);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment