diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-07-31 13:39:26 +0200 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-02 08:03:23 +0900 |
| commit | 79b05c1f31e2ed3dbc4e1d098a29687f5c39c495 (patch) | |
| tree | e45018229da44db324200757ff5f711adb8c1a6c | |
| parent | 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe (diff) | |
| download | linux-stable-79b05c1f31e2ed3dbc4e1d098a29687f5c39c495.tar.gz linux-stable-79b05c1f31e2ed3dbc4e1d098a29687f5c39c495.tar.bz2 linux-stable-79b05c1f31e2ed3dbc4e1d098a29687f5c39c495.zip | |
um: stop abusing KBUILD_KCONFIG
Instead create a arch/um/Kconfig file that just includes the actual
per-arch Kconfig file. Note that we use HEADER_ARCH to find the
per-arch Kconfig file as that variable already includes the
normalization from i386 or x86_64 to x86.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | arch/um/Kconfig | 3 | ||||
| -rw-r--r-- | arch/um/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86/um/Kconfig | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig new file mode 100644 index 000000000000..76b4a32c9f42 --- /dev/null +++ b/arch/um/Kconfig @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +source "arch/$(HEADER_ARCH)/um/Kconfig" diff --git a/arch/um/Makefile b/arch/um/Makefile index e54dda8a0363..d427bfc6948f 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -113,8 +113,6 @@ define archhelp echo ' find in the kernel root.' endef -KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig - archheaders: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ kbuild-file=$(HOST_DIR)/include/asm/Kbuild \ @@ -176,4 +174,4 @@ endef include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s $(call filechk,gen-asm-offsets) -export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH +export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig index 9d529f22fd9d..7e509c83d80d 100644 --- a/arch/x86/um/Kconfig +++ b/arch/x86/um/Kconfig @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -mainmenu "User Mode Linux/$(SUBARCH) $(KERNELVERSION) Kernel Configuration" - -comment "Compiler: $(CC_VERSION_TEXT)" - -source "scripts/Kconfig.include" source "arch/um/Kconfig.common" |