aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/virtext.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h
index 298b6a06110d..7dee5b59930e 100644
--- a/arch/x86/include/asm/virtext.h
+++ b/arch/x86/include/asm/virtext.h
@@ -18,6 +18,8 @@
18#include <asm/processor.h> 18#include <asm/processor.h>
19#include <asm/system.h> 19#include <asm/system.h>
20 20
21#include <asm/vmx.h>
22
21/* 23/*
22 * VMX functions: 24 * VMX functions:
23 */ 25 */
@@ -28,4 +30,17 @@ static inline int cpu_has_vmx(void)
28 return test_bit(5, &ecx); /* CPUID.1:ECX.VMX[bit 5] -> VT */ 30 return test_bit(5, &ecx); /* CPUID.1:ECX.VMX[bit 5] -> VT */
29} 31}
30 32
33
34/** Disable VMX on the current CPU
35 *
36 * vmxoff causes a undefined-opcode exception if vmxon was not run
37 * on the CPU previously. Only call this function if you know VMX
38 * is enabled.
39 */
40static inline void cpu_vmxoff(void)
41{
42 asm volatile (ASM_VMX_VMXOFF : : : "cc");
43 write_cr4(read_cr4() & ~X86_CR4_VMXE);
44}
45
31#endif /* _ASM_X86_VIRTEX_H */ 46#endif /* _ASM_X86_VIRTEX_H */