From 0f4c0e68d6eceee9c12fbe49feaea1d8b2fb779f Mon Sep 17 00:00:00 2001
From: Ryan Harper <ryanh@us.ibm.com>
Date: Tue, 18 Sep 2007 14:05:16 -0500
Subject: [PATCH] --- yaml --- r: 80633 b: refs/heads/master c:
 217648638ccb62dfeea5ac5fe768539cdee61ed0 h: refs/heads/master i:   80631:
 f24cb691e861a2b6b9f559df4ebae847675ab2f8 v: v3

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

diff --git a/[refs] b/[refs]
index 7c7db6944cc4..1ad998f580b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12b7d28fc102b772eb70f98491587ec5ee717baf
+refs/heads/master: 217648638ccb62dfeea5ac5fe768539cdee61ed0
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index 82cc7ae0fc83..2d55bab41634 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -554,14 +554,11 @@ void set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
 				inject_gp(vcpu);
 				return;
 			}
-		} else {
-			if (cr3 & CR3_NONPAE_RESERVED_BITS) {
-				printk(KERN_DEBUG
-				       "set_cr3: #GP, reserved bits\n");
-				inject_gp(vcpu);
-				return;
-			}
 		}
+		/*
+		 * We don't check reserved bits in nonpae mode, because
+		 * this isn't enforced, and VMware depends on this.
+		 */
 	}
 
 	mutex_lock(&vcpu->kvm->lock);