X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fum%2FMakefile-x86_64;h=8ed362f93582e9723aaacde7325553f9de435383;hb=8854cb49a249c8df883874e64dfbc25eaa69a6ee;hp=8a00e5f6934c84f5b2ee94e7312dba33a781d426;hpb=f2e1d89f9b349b3cd914b7c6ec6368632f4ad048;p=linux-2.6

diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 8a00e5f693..8ed362f935 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -6,15 +6,12 @@ START := 0x60000000
 
 _extra_flags_ = -fno-builtin -m64
 
-#We #undef __x86_64__ for kernelspace, not for userspace where
-#it's needed for headers to work!
-ARCH_KERNEL_DEFINES = -U__$(SUBARCH)__
-CFLAGS += $(_extra_flags_)
+KBUILD_CFLAGS += $(_extra_flags_)
 
-CHECKFLAGS  += -m64
-AFLAGS += -m64
+CHECKFLAGS  += -m64 -D__x86_64__
+KBUILD_AFLAGS += -m64
 LDFLAGS += -m elf_x86_64
-CPPFLAGS += -m64
+KBUILD_CPPFLAGS += -m64
 
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64