From 6df0c6c8bcbb5e6d5c37a553f85d80e7b71fd53f Mon Sep 17 00:00:00 2001
From: Zhang Xiantao <xiantao.zhang@intel.com>
Date: Wed, 14 Nov 2007 20:08:51 +0800
Subject: [PATCH] --- yaml --- r: 80719 b: refs/heads/master c:
 d825ed0a97b8e82597dd652bfe51fed3fa9b3c9a h: refs/heads/master i:   80717:
 21f8daeec6eced0f7777b25908ac655fb33c8764   80715:
 a82703b14dfbd832e3ed892583375b2e63727f65   80711:
 8f0494c08043543fc01e4f71d0be6955e4a5d8af   80703:
 4dee9cab2a458dddccb5f31abe8ffd53cf7f3186 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm_main.c | 2 --
 trunk/drivers/kvm/x86.c      | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9738672ca173..2b0ce2cf2773 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0506bcba5992650b1190de9125f5963a30f32e2
+refs/heads/master: d825ed0a97b8e82597dd652bfe51fed3fa9b3c9a
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index d68901bd0693..6aaba79f8c5a 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -17,7 +17,6 @@
 
 #include "kvm.h"
 #include "x86.h"
-#include "x86_emulate.h"
 #include "irq.h"
 
 #include <linux/kvm.h>
@@ -44,7 +43,6 @@
 #include <linux/mman.h>
 
 #include <asm/processor.h>
-#include <asm/msr.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/desc.h>
diff --git a/trunk/drivers/kvm/x86.c b/trunk/drivers/kvm/x86.c
index 394da6605364..4282a0fb2962 100644
--- a/trunk/drivers/kvm/x86.c
+++ b/trunk/drivers/kvm/x86.c
@@ -16,6 +16,7 @@
 
 #include "kvm.h"
 #include "x86.h"
+#include "x86_emulate.h"
 #include "segment_descriptor.h"
 #include "irq.h"
 
@@ -25,6 +26,7 @@
 #include <linux/module.h>
 
 #include <asm/uaccess.h>
+#include <asm/msr.h>
 
 #define MAX_IO_MSRS 256
 #define CR0_RESERVED_BITS						\