diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-16 08:33:30 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-16 08:33:30 (GMT) |
| commit | 860fc2f2640ec348b9520ca4649b1bfd23d91bc2 (patch) | |
| tree | 73d90d6ef86893c89bb70e78a2b63295d531f371 /arch/x86/kvm/vmx.c | |
| parent | 197749981e539c1eb5863f417de6dd4e2c02b76c (diff) | |
| parent | bee09ed91cacdbffdbcd3b05de8409c77ec9fcd6 (diff) | |
| download | linux-860fc2f2640ec348b9520ca4649b1bfd23d91bc2.tar.xz | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes, refresh the development tree.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index b2fe1c2..da7837e 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8283,8 +8283,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, vcpu->arch.cr4_guest_owned_bits = ~vmcs_readl(CR4_GUEST_HOST_MASK); kvm_set_cr4(vcpu, vmcs12->host_cr4); - if (nested_cpu_has_ept(vmcs12)) - nested_ept_uninit_mmu_context(vcpu); + nested_ept_uninit_mmu_context(vcpu); kvm_set_cr3(vcpu, vmcs12->host_cr3); kvm_mmu_reset_context(vcpu); |