From 38f22bfb5843b1447a78511fe22b03768628595c Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 13 Dec 2006 00:34:16 -0800 Subject: [PATCH] --- yaml --- r: 44450 b: refs/heads/master c: bfdc0c280a497575670e87efa89e78a88438483b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/kvm/vmx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 284ce27d650a..921fe0147aa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b99ab242145c99ec8781dc267ec100e7f23ef9d +refs/heads/master: bfdc0c280a497575670e87efa89e78a88438483b diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c index ea3bdbb0da9c..f0f0b1a781f8 100644 --- a/trunk/drivers/kvm/vmx.c +++ b/trunk/drivers/kvm/vmx.c @@ -534,7 +534,7 @@ static __init void hardware_enable(void *garbage) u64 old; rdmsrl(MSR_IA32_FEATURE_CONTROL, old); - if ((old & 5) == 0) + if ((old & 5) != 5) /* enable and lock */ wrmsrl(MSR_IA32_FEATURE_CONTROL, old | 5); write_cr4(read_cr4() | CR4_VMXE); /* FIXME: not cpu hotplug safe */