From d51b86cbc709bb2f54d6acd44d2f492619a817c7 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Thu, 19 Apr 2007 13:26:39 +0300
Subject: [PATCH] --- yaml --- r: 54105 b: refs/heads/master c:
 35cc7f971188366f5a5c0d5da1456bb38cef5da9 h: refs/heads/master i:   54103:
 ab49d2bae541f91175bdd2dcd59982b5afa10c8c v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/kvm/kvm_vmx.h | 14 --------------
 trunk/drivers/kvm/vmx.c     |  7 ++++++-
 3 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 trunk/drivers/kvm/kvm_vmx.h

diff --git a/[refs] b/[refs]
index 57b8f78880e1..3b3dec0d29e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e38aea3e9330624d19a233c05f3e69c57519edd5
+refs/heads/master: 35cc7f971188366f5a5c0d5da1456bb38cef5da9
diff --git a/trunk/drivers/kvm/kvm_vmx.h b/trunk/drivers/kvm/kvm_vmx.h
deleted file mode 100644
index d139f73fb6e1..000000000000
--- a/trunk/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/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index 6270df58e055..b61d4dd804e3 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/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)