kvm tools: Fix E820 map on x86-64

We must not define '-D__x86_64__' for all the code because the BIOS emulation
code is actually real mode 16-bite code. This fixes E820 map regression on
x86-64 caused by commit e227ea5 ("kvm tools: Fix compilation on x86_64").

Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index b2aecc1cc253dc99dbc1923d85961154a7d7987d..11306813b6d7d6030d31360aaaab5896cd19e7da 100644 (file)
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -38,7 +38,7 @@ ifeq ($(uname_M),i386)
        DEFINES      += -DCONFIG_X86_32
 endif
 ifeq ($(uname_M),x86_64)
-       DEFINES      += -DCONFIG_X86_64 -D__x86_64__
+       DEFINES      += -DCONFIG_X86_64
 endif
 
 DEFINES        += -D_FILE_OFFSET_BITS=64