From f2b8e78405a140ab8631e519f7151dd329926028 Mon Sep 17 00:00:00 2001
From: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Date: Mon, 31 May 2010 17:11:39 +0800
Subject: [PATCH] --- yaml --- r: 202309 b: refs/heads/master c:
 b66d80006e415ee083e59c9429911eab78047f8f h: refs/heads/master i:   202307:
 9a6671591dca68bf2f3ed6658ad43ff757411c1e v: v3

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

diff --git a/[refs] b/[refs]
index e97fb604d7fc..ebd112529e0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 316b95216e277cdb22bd65346f9b9d9e10d0f53d
+refs/heads/master: b66d80006e415ee083e59c9429911eab78047f8f
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index 69d40a6e1e68..d3cd102aee26 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -1378,7 +1378,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,
 	if (role.direct)
 		role.cr4_pae = 0;
 	role.access = access;
-	if (vcpu->arch.mmu.root_level <= PT32_ROOT_LEVEL) {
+	if (!tdp_enabled && vcpu->arch.mmu.root_level <= PT32_ROOT_LEVEL) {
 		quadrant = gaddr >> (PAGE_SHIFT + (PT64_PT_BITS * level));
 		quadrant &= (1 << ((PT32_PT_BITS - PT64_PT_BITS) * level)) - 1;
 		role.quadrant = quadrant;