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