aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-11-17 06:40:50 -0500
committerAvi Kivity <avi@redhat.com>2011-01-12 04:29:32 -0500
commit8a6bcaa6efeb7f970474890d4dcfe89774ff26a4 (patch)
treecb9d11d9048cfcb8c7ae573c490f342d725b3235 /arch
parentf9335afea5d649693aee1ec8af2cc8ccf376f5a9 (diff)
KVM: x86 emulator: drop unused #ifndef __KERNEL__
Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/emulate.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 38b6e8dafaff..ffd6e017b619 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -20,16 +20,9 @@
20 * From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4 20 * From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4
21 */ 21 */
22 22
23#ifndef __KERNEL__
24#include <stdio.h>
25#include <stdint.h>
26#include <public/xen.h>
27#define DPRINTF(_f, _a ...) printf(_f , ## _a)
28#else
29#include <linux/kvm_host.h> 23#include <linux/kvm_host.h>
30#include "kvm_cache_regs.h" 24#include "kvm_cache_regs.h"
31#define DPRINTF(x...) do {} while (0) 25#define DPRINTF(x...) do {} while (0)
32#endif
33#include <linux/module.h> 26#include <linux/module.h>
34#include <asm/kvm_emulate.h> 27#include <asm/kvm_emulate.h>
35 28