From 4e6936576b7d5ff972f798a5f622e5a4c8ed939e Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 3 Apr 2011 11:25:14 +0300
Subject: [PATCH] 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>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b2aecc1..1130681 100644
--- a/Makefile
+++ b/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