[PATCH 02/10] um: cleanup Kconfig files

[Christoph Hellwig]

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 
Acked-by: Richard Weinberger 
---
 arch/um/Kconfig| 210 +
 arch/um/Kconfig.common |  60 
 arch/um/Kconfig.rest   |  22 -
 arch/um/Kconfig.um | 124 
 arch/x86/um/Kconfig|  10 --
 5 files changed, 210 insertions(+), 216 deletions(-)
 delete mode 100644 arch/um/Kconfig.common
 delete mode 100644 arch/um/Kconfig.rest
 delete mode 100644 arch/um/Kconfig.um

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 76b4a32c9f42..69fa01a4a81b 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -1,3 +1,213 @@
 # SPDX-License-Identifier: GPL-2.0
 
+menu "UML-specific options"
+
+config UML
+   bool
+   default y
+   select ARCH_HAS_KCOV
+   select HAVE_ARCH_AUDITSYSCALL
+   select HAVE_ARCH_SECCOMP_FILTER
+   select HAVE_UID16
+   select HAVE_FUTEX_CMPXCHG if FUTEX
+   select HAVE_DEBUG_KMEMLEAK
+   select GENERIC_IRQ_SHOW
+   select GENERIC_CPU_DEVICES
+   select GENERIC_CLOCKEVENTS
+   select HAVE_GCC_PLUGINS
+   select TTY # Needed for line.c
+
+config MMU
+   bool
+   default y
+
+config NO_IOMEM
+   def_bool y
+
+config ISA
+   bool
+
+config SBUS
+   bool
+
+config PCI
+   bool
+
+config PCMCIA
+   bool
+
+config TRACE_IRQFLAGS_SUPPORT
+   bool
+   default y
+
+config LOCKDEP_SUPPORT
+   bool
+   default y
+
+config STACKTRACE_SUPPORT
+   bool
+   default y
+   select STACKTRACE
+
+config GENERIC_CALIBRATE_DELAY
+   bool
+   default y
+
+config HZ
+   int
+   default 100
+
+config NR_CPUS
+   int
+   range 1 1
+   default 1
+
 source "arch/$(HEADER_ARCH)/um/Kconfig"
+
+config STATIC_LINK
+   bool "Force a static link"
+   default n
+   help
+ This option gives you the ability to force a static link of UML.
+ Normally, UML is linked as a shared binary.  This is inconvenient for
+ use in a chroot jail.  So, if you intend to run UML inside a chroot,
+ you probably want to say Y here.
+ Additionally, this option enables using higher memory spaces (up to
+ 2.75G) for UML.
+
+source "mm/Kconfig"
+
+config LD_SCRIPT_STATIC
+   bool
+   default y
+   depends on STATIC_LINK
+
+config LD_SCRIPT_DYN
+   bool
+   default y
+   depends on !LD_SCRIPT_STATIC
+select MODULE_REL_CRCS if MODVERSIONS
+
+source "fs/Kconfig.binfmt"
+
+config HOSTFS
+   tristate "Host filesystem"
+   help
+  While the User-Mode Linux port uses its own root file system for
+  booting and normal file access, this module lets the UML user
+  access files stored on the host.  It does not require any
+  network connection between the Host and UML.  An example use of
+  this might be:
+
+  mount none /tmp/fromhost -t hostfs -o /tmp/umlshare
+
+  where /tmp/fromhost is an empty directory inside UML and
+  /tmp/umlshare is a directory on the host with files the UML user
+  wishes to access.
+
+  For more information, see
+  .
+
+  If you'd like to be able to work with files stored on the host,
+  say Y or M here; otherwise say N.
+
+config MCONSOLE
+   bool "Management console"
+   depends on PROC_FS
+   default y
+   help
+  The user mode linux management console is a low-level interface to
+  the kernel, somewhat like the i386 SysRq interface.  Since there is
+  a full-blown operating system running under every user mode linux
+  instance, there is much greater flexibility possible than with the
+  SysRq mechanism.
+
+  If you answer 'Y' to this option, to use this feature, you need the
+  mconsole client (called uml_mconsole) which is present in CVS in
+  2.4.5-9um and later (path /tools/mconsole), and is also in the
+  distribution RPM package in 2.4.6 and later.
+
+  It is safe to say 'Y' here.
+
+config MAGIC_SYSRQ
+   bool "Magic SysRq key"
+   depends on MCONSOLE
+   help
+ If you say Y here, you will have some control over the system even
+ if the system crashes for example during kernel debugging (e.g., you
+ will be able to flush the buffer cache to disk, reboot the system
+ immediately or dump some status information). A key for each of the
+ possible requests is provided.
+
+ This is the feature normally accomplished by pressing a key
+ while holding SysRq (Alt+PrintScreen).
+
+ On UML, this is accomplished by sending a "sysrq" comm

[PATCH 02/10] um: cleanup Kconfig files

[Christoph Hellwig]

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 
Acked-by: Richard Weinberger 
---
 arch/um/Kconfig| 210 +
 arch/um/Kconfig.common |  60 
 arch/um/Kconfig.rest   |  22 -
 arch/um/Kconfig.um | 124 
 arch/x86/um/Kconfig|  10 --
 5 files changed, 210 insertions(+), 216 deletions(-)
 delete mode 100644 arch/um/Kconfig.common
 delete mode 100644 arch/um/Kconfig.rest
 delete mode 100644 arch/um/Kconfig.um

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 24607af202dc..1f605a7281cc 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -1,3 +1,213 @@
 # SPDX-License-Identifier: GPL-2.0
 
+menu "UML-specific options"
+
+config UML
+   bool
+   default y
+   select ARCH_HAS_KCOV
+   select HAVE_ARCH_AUDITSYSCALL
+   select HAVE_ARCH_SECCOMP_FILTER
+   select HAVE_UID16
+   select HAVE_FUTEX_CMPXCHG if FUTEX
+   select HAVE_DEBUG_KMEMLEAK
+   select GENERIC_IRQ_SHOW
+   select GENERIC_CPU_DEVICES
+   select GENERIC_CLOCKEVENTS
+   select HAVE_GCC_PLUGINS
+   select TTY # Needed for line.c
+
+config MMU
+   bool
+   default y
+
+config NO_IOMEM
+   def_bool y
+
+config ISA
+   bool
+
+config SBUS
+   bool
+
+config PCI
+   bool
+
+config PCMCIA
+   bool
+
+config TRACE_IRQFLAGS_SUPPORT
+   bool
+   default y
+
+config LOCKDEP_SUPPORT
+   bool
+   default y
+
+config STACKTRACE_SUPPORT
+   bool
+   default y
+   select STACKTRACE
+
+config GENERIC_CALIBRATE_DELAY
+   bool
+   default y
+
+config HZ
+   int
+   default 100
+
+config NR_CPUS
+   int
+   range 1 1
+   default 1
+
 source "arch/$(SUBARCH)/um/Kconfig"
+
+config STATIC_LINK
+   bool "Force a static link"
+   default n
+   help
+ This option gives you the ability to force a static link of UML.
+ Normally, UML is linked as a shared binary.  This is inconvenient for
+ use in a chroot jail.  So, if you intend to run UML inside a chroot,
+ you probably want to say Y here.
+ Additionally, this option enables using higher memory spaces (up to
+ 2.75G) for UML.
+
+source "mm/Kconfig"
+
+config LD_SCRIPT_STATIC
+   bool
+   default y
+   depends on STATIC_LINK
+
+config LD_SCRIPT_DYN
+   bool
+   default y
+   depends on !LD_SCRIPT_STATIC
+select MODULE_REL_CRCS if MODVERSIONS
+
+source "fs/Kconfig.binfmt"
+
+config HOSTFS
+   tristate "Host filesystem"
+   help
+  While the User-Mode Linux port uses its own root file system for
+  booting and normal file access, this module lets the UML user
+  access files stored on the host.  It does not require any
+  network connection between the Host and UML.  An example use of
+  this might be:
+
+  mount none /tmp/fromhost -t hostfs -o /tmp/umlshare
+
+  where /tmp/fromhost is an empty directory inside UML and
+  /tmp/umlshare is a directory on the host with files the UML user
+  wishes to access.
+
+  For more information, see
+  .
+
+  If you'd like to be able to work with files stored on the host,
+  say Y or M here; otherwise say N.
+
+config MCONSOLE
+   bool "Management console"
+   depends on PROC_FS
+   default y
+   help
+  The user mode linux management console is a low-level interface to
+  the kernel, somewhat like the i386 SysRq interface.  Since there is
+  a full-blown operating system running under every user mode linux
+  instance, there is much greater flexibility possible than with the
+  SysRq mechanism.
+
+  If you answer 'Y' to this option, to use this feature, you need the
+  mconsole client (called uml_mconsole) which is present in CVS in
+  2.4.5-9um and later (path /tools/mconsole), and is also in the
+  distribution RPM package in 2.4.6 and later.
+
+  It is safe to say 'Y' here.
+
+config MAGIC_SYSRQ
+   bool "Magic SysRq key"
+   depends on MCONSOLE
+   help
+ If you say Y here, you will have some control over the system even
+ if the system crashes for example during kernel debugging (e.g., you
+ will be able to flush the buffer cache to disk, reboot the system
+ immediately or dump some status information). A key for each of the
+ possible requests is provided.
+
+ This is the feature normally accomplished by pressing a key
+ while holding SysRq (Alt+PrintScreen).
+
+ On UML, this is accomplished by sending a "sysrq" command