Merge tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiro...

[uclinux-h8/linux.git] / arch / um / Makefile

diff --git a/arch/um/Makefile b/arch/um/Makefile
index d427bfc..44ddc3e 100644 (file)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -114,14 +114,7 @@ define archhelp
 endef
 
 archheaders:
-       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
-                   kbuild-file=$(HOST_DIR)/include/asm/Kbuild \
-                   obj=$(HOST_DIR)/include/generated/asm
-       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
-                   kbuild-file=$(HOST_DIR)/include/uapi/asm/Kbuild \
-                   obj=$(HOST_DIR)/include/generated/uapi/asm
-       $(Q)$(MAKE) KBUILD_SRC= ARCH=$(HEADER_ARCH) archheaders
-
+       $(Q)$(MAKE) -f $(srctree)/Makefile ARCH=$(HEADER_ARCH) asm-generic archheaders
 
 archprepare: include/generated/user_constants.h
 
@@ -167,7 +160,7 @@ define filechk_gen-asm-offsets
          echo " *"; \
          echo " */"; \
          echo ""; \
-         sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
+         sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}" < $<; \
          echo ""; )
 endef