From: Avi Kivity <avi@redhat.com>
Date: Wed, 17 Nov 2010 11:40:50 +0000 (+0200)
Subject: KVM: x86 emulator: drop unused #ifndef __KERNEL__
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8a6bcaa6efeb7f970474890d4dcfe89774ff26a4;p=openwrt%2Fstaging%2Fblogic.git

KVM: x86 emulator: drop unused #ifndef __KERNEL__

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

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 @@
  * From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4
  */
 
-#ifndef __KERNEL__
-#include <stdio.h>
-#include <stdint.h>
-#include <public/xen.h>
-#define DPRINTF(_f, _a ...) printf(_f , ## _a)
-#else
 #include <linux/kvm_host.h>
 #include "kvm_cache_regs.h"
 #define DPRINTF(x...) do {} while (0)
-#endif
 #include <linux/module.h>
 #include <asm/kvm_emulate.h>