From 338382f9ab71ccab9925df9c69cebe2eb4180bd3 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Wed, 14 Jul 2010 19:05:45 +0300
Subject: [PATCH] --- yaml --- r: 202417 b: refs/heads/master c:
 68be0803456b3eed33038be5566710ad7648c854 h: refs/heads/master i:   202415:
 14c62e1ea53a6502b08ae9505e6ecbc3767a6e35 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 75fcd3c4e273..ae44210b6de6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d153513ddef5698a292b53790008b2e7660cd08d
+refs/heads/master: 68be0803456b3eed33038be5566710ad7648c854
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index eb55ec55125c..689c2c3182ab 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -3936,6 +3936,9 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t gva)
 {
 	gpa_t gpa;
 
+	if (tdp_enabled)
+		return false;
+
 	/*
 	 * if emulation was due to access to shadowed page table
 	 * and it failed try to unshadow page and re-entetr the