From bc2e2370f81f16f0b98a21665a6e1e2e0f718713 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng@linux.intel.com>
Date: Tue, 11 Nov 2008 15:30:40 +0800
Subject: [PATCH] --- yaml --- r: 125225 b: refs/heads/master c:
 e7cacd40d20849f69c908f1290c714145073685a h: refs/heads/master i:   125223:
 3b7276b81cedb3c68ca957c528ac9ef9e267da9b v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 908b0e22b9c4..cebda5a679a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30ed5bb685ab03c9bdf812502900b65087d61490
+refs/heads/master: e7cacd40d20849f69c908f1290c714145073685a
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index 0a0a9595ba3b..4727c08da2e9 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -715,7 +715,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
 		goto out;
 	if (mem->guest_phys_addr & (PAGE_SIZE - 1))
 		goto out;
-	if (mem->userspace_addr & (PAGE_SIZE - 1))
+	if (user_alloc && (mem->userspace_addr & (PAGE_SIZE - 1)))
 		goto out;
 	if (mem->slot >= KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS)
 		goto out;