KVM: Portability: Move some includes to x86.c
Move some includes to x86.c from kvm_main.c, since the related functions
have been moved to x86.c
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Acked-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index d68901b..6aaba79 100644
--- a/drivers/kvm/kvm_main.c
+++ b/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/drivers/kvm/x86.c b/drivers/kvm/x86.c
index 394da66..4282a0f 100644
--- a/drivers/kvm/x86.c
+++ b/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 \