aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-04-19 06:26:39 -0400
committerAvi Kivity <avi@qumranet.com>2007-05-03 03:52:30 -0400
commit35cc7f971188366f5a5c0d5da1456bb38cef5da9 (patch)
treee5e097b3d59199306b72895677bbf9bf213d2550 /drivers/kvm
parente38aea3e9330624d19a233c05f3e69c57519edd5 (diff)
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/kvm')
-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 d139f73fb6e1..000000000000
--- a/drivers/kvm/kvm_vmx.h
+++ /dev/null
@@ -1,14 +0,0 @@
1#ifndef __KVM_VMX_H
2#define __KVM_VMX_H
3
4#ifdef CONFIG_X86_64
5/*
6 * avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
7 * mechanism (cpu bug AA24)
8 */
9#define NR_BAD_MSRS 2
10#else
11#define NR_BAD_MSRS 0
12#endif
13
14#endif
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 6270df58e055..b61d4dd804e3 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -17,7 +17,6 @@
17 17
18#include "kvm.h" 18#include "kvm.h"
19#include "vmx.h" 19#include "vmx.h"
20#include "kvm_vmx.h"
21#include <linux/module.h> 20#include <linux/module.h>
22#include <linux/kernel.h> 21#include <linux/kernel.h>
23#include <linux/mm.h> 22#include <linux/mm.h>
@@ -81,8 +80,14 @@ static const u32 vmx_msr_index[] = {
81#ifdef CONFIG_X86_64 80#ifdef CONFIG_X86_64
82static unsigned msr_offset_kernel_gs_base; 81static unsigned msr_offset_kernel_gs_base;
83#define NR_64BIT_MSRS 4 82#define NR_64BIT_MSRS 4
83/*
84 * avoid save/load MSR_SYSCALL_MASK and MSR_LSTAR by std vt
85 * mechanism (cpu bug AA24)
86 */
87#define NR_BAD_MSRS 2
84#else 88#else
85#define NR_64BIT_MSRS 0 89#define NR_64BIT_MSRS 0
90#define NR_BAD_MSRS 0
86#endif 91#endif
87 92
88static inline int is_page_fault(u32 intr_info) 93static inline int is_page_fault(u32 intr_info)