1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 8a00e5f6934c..fe5316f0c6a5 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -9,12 +9,12 @@ _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
+KBUILD_AFLAGS += -m64
 LDFLAGS += -m elf_x86_64
-CPPFLAGS += -m64
+KBUILD_CPPFLAGS += -m64
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64

diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index 8a00e5f6934c..fe5316f0c6a5 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64
@@ -9,12 +9,12 @@ _extra_flags_ = -fno-builtin -m64
9	#We #undef __x86_64__ for kernelspace, not for userspace where	9	#We #undef __x86_64__ for kernelspace, not for userspace where
10	#it's needed for headers to work!	10	#it's needed for headers to work!
11	ARCH_KERNEL_DEFINES = -U__$(SUBARCH)__	11	ARCH_KERNEL_DEFINES = -U__$(SUBARCH)__
12	CFLAGS += $(_extra_flags_)	12	KBUILD_CFLAGS += $(_extra_flags_)
13		13
14	CHECKFLAGS += -m64	14	CHECKFLAGS += -m64
15	AFLAGS += -m64	15	KBUILD_AFLAGS += -m64
16	LDFLAGS += -m elf_x86_64	16	LDFLAGS += -m elf_x86_64
17	CPPFLAGS += -m64	17	KBUILD_CPPFLAGS += -m64
18		18
19	ELF_ARCH := i386:x86-64	19	ELF_ARCH := i386:x86-64
20	ELF_FORMAT := elf64-x86-64	20	ELF_FORMAT := elf64-x86-64