diff --git a/[refs] b/[refs] index 32b4542c713c..fd7754492d0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5e97c80b5ddd6139bdadcbd44e263c2a3e7fae6 +refs/heads/master: 286da4156dc65c8a054580fdd96b7709132dce8d diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index f942b201b345..20409bd5eb4a 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -4035,9 +4035,6 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu) ret = 0; - /* HACK: Don't enable emulation on guest boot/reset */ - vmx->emulation_required = 0; - return ret; }