From 27cf17df22f3aff733ecc5e5a230e7bf2b49f647 Mon Sep 17 00:00:00 2001 From: Xiao Guangrong Date: Tue, 6 Apr 2010 18:29:05 +0800 Subject: [PATCH] --- yaml --- r: 197736 b: refs/heads/master c: f84cbb0561d7cefb5fc050ee99d8c82ec9ce883d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/kvm_host.h | 2 -- trunk/arch/x86/kvm/mmu.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 70e7fb013cf6..a255bc1e3ce0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 805d32dea4dfb8319aaf7e73a681ad410a5e331a +refs/heads/master: f84cbb0561d7cefb5fc050ee99d8c82ec9ce883d diff --git a/trunk/arch/x86/include/asm/kvm_host.h b/trunk/arch/x86/include/asm/kvm_host.h index 26c629a062db..0c49c888be6b 100644 --- a/trunk/arch/x86/include/asm/kvm_host.h +++ b/trunk/arch/x86/include/asm/kvm_host.h @@ -187,8 +187,6 @@ struct kvm_mmu_page { struct list_head link; struct hlist_node hash_link; - struct list_head oos_link; - /* * The following two entries are used to key the shadow page in the * hash table. diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c index 6ed7d633aefe..ec8900b6692a 100644 --- a/trunk/arch/x86/kvm/mmu.c +++ b/trunk/arch/x86/kvm/mmu.c @@ -923,7 +923,6 @@ static struct kvm_mmu_page *kvm_mmu_alloc_page(struct kvm_vcpu *vcpu, sp->gfns = mmu_memory_cache_alloc(&vcpu->arch.mmu_page_cache, PAGE_SIZE); set_page_private(virt_to_page(sp->spt), (unsigned long)sp); list_add(&sp->link, &vcpu->kvm->arch.active_mmu_pages); - INIT_LIST_HEAD(&sp->oos_link); bitmap_zero(sp->slot_bitmap, KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS); sp->multimapped = 0; sp->parent_pte = parent_pte;