Acked-by: Carsten Otte <co...@de...>
Zhang, Xiantao wrote:
> From fc56bda0f599ccd00d992bf196654101e82d1413 Mon Sep 17 00:00:00 2001
> From: Zhang Xiantao <xia...@in...>
> Date: Wed, 7 Nov 2007 11:39:23 +0800
> Subject: [PATCH] move some header files form kvm_main.c to x86.c, since
> the
> related functions have been moved to x86.c
> Signed-off-by: Zhang Xiantao <xia...@in...>
> ---
> drivers/kvm/kvm_main.c | 2 --
> drivers/kvm/x86.c | 2 ++
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
> index 0b8edca..010f079 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 e905d46..7ea470e 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
> \
|
