um: most of the SUBARCH uses can be killed

[mirror_ubuntu-bionic-kernel.git] / arch / um / Makefile

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 28688e6d96d795c3f860f5343524584b0cefb994..4c993c89d0f02284bbc66e279a30ad865557b52b 100644 (file)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -50,7 +50,7 @@ KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um
 #
 # These apply to USER_CFLAGS to.
 
-KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
+KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \
        $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap      \
        -Din6addr_loopback=kernel_in6addr_loopback \
        -Din6addr_any=kernel_in6addr_any -Dstrrchr=kernel_strrchr
@@ -99,7 +99,7 @@ KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig
 
 archheaders:
        $(Q)$(MAKE) -C '$(srctree)' KBUILD_SRC= \
-               ARCH=$(SUBARCH) O='$(objtree)' archheaders
+               ARCH=$(HEADER_ARCH) O='$(objtree)' archheaders
 
 archprepare: include/generated/user_constants.h