Change __x86_x__ to CONFIG_X86_X

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index 5b9c39a099b63acbac02997ae48a1993192c4360..8113dcfe95bf716468b4eda0d7dc0d187ff89de6 100644 (file)
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -22,9 +22,9 @@ OBJS  += bios/int10.o
 
 uname_M      := $(shell uname -m | sed -e s/i.86/i386/)
 ifeq ($(uname_M),i386)
-DEFINES      += -D__x86_32__
+DEFINES      += -DCONFIG_X86_32
 ifeq ($(uname_M),x86_64)
-DEFINES      += -D__x86_64__
+DEFINES      += -DCONFIG_X86_64
 endif
 endif
 

diff --git a/tools/kvm/bios/int10.S b/tools/kvm/bios/int10.S
index 90aea1c189bbcde1144dc2cb1ec271209a04bf99..5cec37ca5913b10ff6ac255af057d8b8b42ee5df 100644 (file)
--- a/tools/kvm/bios/int10.S
+++ b/tools/kvm/bios/int10.S
@@ -2,7 +2,7 @@
 #include <kvm/assembly.h>
 
        .org 0
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
        .code64
 #else
        .code32

diff --git a/tools/kvm/bios/intfake.S b/tools/kvm/bios/intfake.S
index a87ace3aeb9e65711fc15ab1cc6b2579bdb6e99b..d8c570a615e477777553b8c448a2deb54e5c2e4d 100644 (file)
--- a/tools/kvm/bios/intfake.S
+++ b/tools/kvm/bios/intfake.S
@@ -2,7 +2,7 @@
 #include <kvm/assembly.h>
 
        .org 0
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
        .code64
 #else
        .code32

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index 0be22c155476c0f3cf50e4d1137cc38917a847c4..23734154172f0e68b35a0a07af27707c40811de5 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -421,7 +421,7 @@ static void kvm__setup_msrs(struct kvm *self)
        self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_SYSENTER_CS,        0x0);
        self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_SYSENTER_ESP,       0x0);
        self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_SYSENTER_EIP,       0x0);
-#ifdef __x86_64__
+#ifdef CONFIG_X86_64
        self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_STAR,               0x0);
        self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_CSTAR,              0x0);
        self->msrs->entries[ndx++] = KVM_MSR_ENTRY(MSR_IA32_KERNEL_GS_BASE,     0x0);