diff --git a/arch/um/Makefile b/arch/um/Makefile index 15ec6b86054b..b15f6048caae 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -56,6 +56,7 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap +AFLAGS += $(ARCH_INCLUDE) USER_CFLAGS := $(patsubst -I%,,$(CFLAGS)) USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \ diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile index 77c3c4d29f55..cdf6b6d4a069 100644 --- a/arch/um/sys-i386/Makefile +++ b/arch/um/sys-i386/Makefile @@ -22,8 +22,6 @@ STUB_CFLAGS = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) # why ask why? $(obj)/stub_segv.o : c_flags = $(STUB_CFLAGS) -$(obj)/stub.o : a_flags = $(STUB_CFLAGS) - subdir- := util include arch/um/scripts/Makefile.unmap diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile index 736d3edec581..32bb7d8219fb 100644 --- a/arch/um/sys-x86_64/Makefile +++ b/arch/um/sys-x86_64/Makefile @@ -33,8 +33,6 @@ STUB_CFLAGS = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) # why ask why? $(obj)/stub_segv.o : c_flags = $(STUB_CFLAGS) -$(obj)/stub.o : a_flags = $(STUB_CFLAGS) - subdir- := util include arch/um/scripts/Makefile.unmap