---

yaml --- r: 97982 b: refs/heads/master c: e693d71 h: refs/heads/master v: v3
git-mirror · Jun 6, 2008 · c4ca24e · c4ca24e
1 parent bd24db7
commit c4ca24e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f5997140f22f68f6390c49941150d3fa8a95cb7
+refs/heads/master: e693d71b46e64536581bf4884434fc1b8797e96f
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -1036,6 +1036,7 @@ static void hardware_enable(void *garbage)
 static void hardware_disable(void *garbage)
 {
 	asm volatile (ASM_VMX_VMXOFF : : : "cc");
+	write_cr4(read_cr4() & ~X86_CR4_VMXE);
 }
 
 static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt,