---

yaml --- r: 45281 b: refs/heads/master c: f51234c h: refs/heads/master i: 45279: 9fd85dd v: v3
git-mirror · Jan 6, 2007 · 4b4bbe0 · 4b4bbe0
1 parent 5346de0
commit 4b4bbe0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 143646567f6dcd584e1ab359b5ec83e0545e70cf
+refs/heads/master: f51234c2cd3ab8bed836e09686e27877e1b55f2a
diff --git a/trunk/drivers/kvm/mmu.c b/trunk/drivers/kvm/mmu.c
@@ -1065,9 +1065,14 @@ EXPORT_SYMBOL_GPL(kvm_mmu_free_some_pages);
 
 static void free_mmu_pages(struct kvm_vcpu *vcpu)
 {
-	while (!list_empty(&vcpu->free_pages)) {
-		struct kvm_mmu_page *page;
+	struct kvm_mmu_page *page;
 
+	while (!list_empty(&vcpu->kvm->active_mmu_pages)) {
+		page = container_of(vcpu->kvm->active_mmu_pages.next,
+				    struct kvm_mmu_page, link);
+		kvm_mmu_zap_page(vcpu, page);
+	}
+	while (!list_empty(&vcpu->free_pages)) {
 		page = list_entry(vcpu->free_pages.next,
 				  struct kvm_mmu_page, link);
 		list_del(&page->link);