diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:15:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:15:39 +0200 |
| commit | cb44d0cfc2969999a4d9e20e4fd8749fec6c5498 (patch) | |
| tree | 51fad115c6e18d0df352531baa1eb9bcb7aaa5e9 /arch/x86/kvm | |
| parent | 482dd2ef124484601adea82e5e806e81e2bc5521 (diff) | |
| parent | d7847a7017b2a2759dd5590c0cffdbdf2994918e (diff) | |
Merge branch 'x86/cpu' into x86/asm, to merge more patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/mmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 70e95d097ef1..bc1e0b65909e 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -3836,7 +3836,8 @@ reset_tdp_shadow_zero_bits_mask(struct kvm_vcpu *vcpu, __reset_rsvds_bits_mask(vcpu, &context->shadow_zero_check, boot_cpu_data.x86_phys_bits, context->shadow_root_level, false, - cpu_has_gbpages, true, true); + boot_cpu_has(X86_FEATURE_GBPAGES), + true, true); else __reset_rsvds_bits_mask_ept(&context->shadow_zero_check, boot_cpu_data.x86_phys_bits, |