summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-04-19 13:26:39 +0300
committerAvi Kivity <avi@qumranet.com>2007-05-03 10:52:30 +0300
commit35cc7f971188366f5a5c0d5da1456bb38cef5da9 (patch)
treee5e097b3d59199306b72895677bbf9bf213d2550 /drivers
parente38aea3e9330624d19a233c05f3e69c57519edd5 (diff)
downloadop-kernel-dev-35cc7f971188366f5a5c0d5da1456bb38cef5da9.zip
op-kernel-dev-35cc7f971188366f5a5c0d5da1456bb38cef5da9.tar.gz
KVM: Fold drivers/kvm/kvm_vmx.h into drivers/kvm/vmx.c
No meat in that file. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/kvm/kvm_vmx.h14
-rw-r--r--drivers/kvm/vmx.c7
2 files changed, 6 insertions, 15 deletions
diff --git a/drivers/kvm/kvm_vmx.h b/drivers/kvm/kvm_vmx.h
deleted file mode 100644
index d139f73..0000000
--- a/drivers/kvm/kvm_vmx.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __KVM_VMX_H
-#define __KVM_VMX_H
-
-#ifdef CONFIG_X86_64
-/*
- * avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
- * mechanism (cpu bug AA24)
- */
-#define NR_BAD_MSRS 2
-#else
-#define NR_BAD_MSRS 0
-#endif
-
-#endif
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 6270df5..b61d4dd 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -17,7 +17,6 @@
#include "kvm.h"
#include "vmx.h"
-#include "kvm_vmx.h"
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -81,8 +80,14 @@ static const u32 vmx_msr_index[] = {
#ifdef CONFIG_X86_64
static unsigned msr_offset_kernel_gs_base;
#define NR_64BIT_MSRS 4
+/*
+ * avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
+ * mechanism (cpu bug AA24)
+ */
+#define NR_BAD_MSRS 2
#else
#define NR_64BIT_MSRS 0
+#define NR_BAD_MSRS 0
#endif
static inline int is_page_fault(u32 intr_info)
OpenPOWER on IntegriCloud