diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-19 14:22:10 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-19 14:22:10 +0800 |
| commit | 122b1ebba1d83ea437f4eecfc2a22b9d0b820f52 (patch) | |
| tree | acad50d2584aa8bd108306b6b47713c319583bf0 /arch/x86 | |
| parent | 0386b3247d31d898edd7fe87c27fced6c9daafad (diff) | |
| parent | 1e8e6b30d014eb77278edb4cd9bee72f0255996f (diff) | |
Merge tag 'v3.18.76' into linux-linaro-lsk-v3.18
This is the 3.18.76 stable release
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index dd3ca375bfdf..a9ca10baf936 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8904,7 +8904,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, * (KVM doesn't change it)- no reason to call set_cr4_guest_host_mask(); */ vcpu->arch.cr4_guest_owned_bits = ~vmcs_readl(CR4_GUEST_HOST_MASK); - kvm_set_cr4(vcpu, vmcs12->host_cr4); + vmx_set_cr4(vcpu, vmcs12->host_cr4); nested_ept_uninit_mmu_context(vcpu); |