renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-20 11:34:02 +08:00
Code

um: stop abusing KBUILD_KCONFIG

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2018-07-31 13:39:26 +02:00 committed by Masahiro Yamada
parent 9d3cce1e8b
commit 79b05c1f31
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/um/Kconfig Normal file
View File

@ -0,0 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
source "arch/$(HEADER_ARCH)/um/Kconfig"

4
arch/um/Makefile
View File

@ -113,8 +113,6 @@ define archhelp
echo ' find in the kernel root.' echo ' find in the kernel root.'
endef endef
KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig
archheaders: archheaders:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
kbuild-file=$(HOST_DIR)/include/asm/Kbuild \ kbuild-file=$(HOST_DIR)/include/asm/Kbuild \
@ -176,4 +174,4 @@ endef
include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s
$(call filechk,gen-asm-offsets) $(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

5
arch/x86/um/Kconfig
View File

@ -1,9 +1,4 @@
# SPDX-License-Identifier: GPL-2.0 # 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" source "arch/um/Kconfig.common"