From 59b632f33f7a6a0a9088a0321060b7856c3de9e3 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 16 Jul 2008 09:21:22 +0800 Subject: [PATCH] --- yaml --- r: 106531 b: refs/heads/master c: 5ec5726a16245138f5d5305b00a752acb5730076 h: refs/heads/master i: 106529: 38260420b9d86b7dec2ef589ca7afda6e9ca01e2 106527: 36879381edec7915c818b63b7a69864daf731a6e v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 199f8dd6e055..aa30ad0a65a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c93cd3a58845012df2d658fecd0ac99f7008d753 +refs/heads/master: 5ec5726a16245138f5d5305b00a752acb5730076 diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index b918fc83435c..f71151d999e4 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -3305,7 +3305,7 @@ static int __init vmx_init(void) vmx_disable_intercept_for_msr(vmx_msr_bitmap, MSR_IA32_SYSENTER_ESP); vmx_disable_intercept_for_msr(vmx_msr_bitmap, MSR_IA32_SYSENTER_EIP); - if (cpu_has_vmx_ept()) + if (vm_need_ept()) bypass_guest_pf = 0; if (bypass_guest_pf)