summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Xiantao2007-11-14 13:08:51 +0100
committerAvi Kivity2008-01-30 16:53:02 +0100
commitd825ed0a97b8e82597dd652bfe51fed3fa9b3c9a (patch)
tree643af5a996516d049437a6714c7adc8f9e9e9748
parentKVM: Change kvm_{read,write}_guest() to use copy_{from,to}_user() (diff)
downloadkernel-qcow2-linux-d825ed0a97b8e82597dd652bfe51fed3fa9b3c9a.tar.gz
kernel-qcow2-linux-d825ed0a97b8e82597dd652bfe51fed3fa9b3c9a.tar.xz
kernel-qcow2-linux-d825ed0a97b8e82597dd652bfe51fed3fa9b3c9a.zip
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>
-rw-r--r--drivers/kvm/kvm_main.c2
-rw-r--r--drivers/kvm/x86.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index d68901bd0693..6aaba79f8c5a 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 394da6605364..4282a0fb2962 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 \