summaryrefslogtreecommitdiffstats
path: root/arch/x86/um
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-07-31 13:39:27 +0200
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-02 08:03:23 +0900
commitf163977d21a2b380ef83c25df2f83740577dc564 (patch)
treedbcd0a630841792c0d06e3c7fc8cb3434587bd88 /arch/x86/um
parent79b05c1f31e2ed3dbc4e1d098a29687f5c39c495 (diff)
downloadlinux-f163977d21a2b380ef83c25df2f83740577dc564.tar.bz2
um: cleanup Kconfig files
We can handle all not architecture specific UM configuration directly in the newly added arch/um/Kconfig. Do so by merging the Kconfig.common, Kconfig.rest and Kconfig.um files into arch/um/Kconfig, and move the main UML menu as well. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/x86/um')
-rw-r--r--arch/x86/um/Kconfig10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 7e509c83d80d..f518b4744ff8 100644
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -1,9 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-source "arch/um/Kconfig.common"
-
-menu "UML-specific options"
-
menu "Host processor type and features"
source "arch/x86/Kconfig.cpu"
@@ -61,9 +57,3 @@ config ARCH_REUSE_HOST_VSYSCALL_AREA
config GENERIC_HWEIGHT
def_bool y
-
-source "arch/um/Kconfig.um"
-
-endmenu
-
-source "arch/um/Kconfig.rest"