From 1f13683dbb4ab8fb68123d96149cc2f163c84581 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Fri, 7 Sep 2012 14:15:03 +0800
Subject: [PATCH] --- yaml --- r: 329909 b: refs/heads/master c:
 7de5bdc96c372ab875408c86e0099958dba89f56 h: refs/heads/master i:   329907:
 ce257bd9a67770ad9a821d22933bf150b066bfc6 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/mmu.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 940a15ee5151..7e97cb9d2909 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b5265d38f6a4d33e9d43974f176f18547687d6
+refs/heads/master: 7de5bdc96c372ab875408c86e0099958dba89f56
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index 399c177212b5..aa0b469ee07d 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -2616,11 +2616,6 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
 			sp = kvm_mmu_get_page(vcpu, pseudo_gfn, iterator.addr,
 					      iterator.level - 1,
 					      1, ACC_ALL, iterator.sptep);
-			if (!sp) {
-				pgprintk("nonpaging_map: ENOMEM\n");
-				kvm_release_pfn_clean(pfn);
-				return -ENOMEM;
-			}
 
 			mmu_spte_set(iterator.sptep,
 				     __pa(sp->spt)