From 52281b084368fa46b6dab8f683f18746591c1991 Mon Sep 17 00:00:00 2001 From: Takuya Yoshikawa Date: Wed, 1 Aug 2012 18:01:10 +0900 Subject: [PATCH] --- yaml --- r: 329831 b: refs/heads/master c: aab2eb7a38e0e510874acca01838f5badbca6c7e h: refs/heads/master i: 329829: 9b8c2324740849f43623b989045da064be7574e1 329827: d65ca091939b6f4c927b32c95d09f8f5255eb568 329823: 5d77b507336b9fd908ffb2cfd321df0bacec9d01 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/x86.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b02969fa196..82dae82a0259 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe56097b23b1303b894eefd91582e4a64247d03f +refs/heads/master: aab2eb7a38e0e510874acca01838f5badbca6c7e diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c index 3ca90d74711d..abc039d78428 100644 --- a/trunk/arch/x86/kvm/x86.c +++ b/trunk/arch/x86/kvm/x86.c @@ -6385,7 +6385,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, *x86 needs to handle !user_alloc case. */ if (!user_alloc) { - if (npages && !old.rmap) { + if (npages && !old.npages) { unsigned long userspace_addr; userspace_addr = vm_mmap(NULL, 0, @@ -6413,7 +6413,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, int nr_mmu_pages = 0, npages = mem->memory_size >> PAGE_SHIFT; - if (!user_alloc && !old.user_alloc && old.rmap && !npages) { + if (!user_alloc && !old.user_alloc && old.npages && !npages) { int ret; ret = vm_munmap(old.userspace_addr,