diff options
| author | Kees Cook <keescook@chromium.org> | 2012-10-02 11:16:46 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2013-01-11 11:38:04 -0800 |
| commit | 75dacf5d808101af96866dd1fba1be1a58b77260 (patch) | |
| tree | eb1e1a7b4d4a33a84ce39f3b293bdb1412028bcb | |
| parent | b186ba6e0ff4e209a55afab5377622dcbf7f02e4 (diff) | |
arch/um: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
CC: Jeff Dike <jdike@addtoit.com>
CC: Richard Weinberger <richard@nod.at>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | arch/um/Kconfig.net | 2 | ||||
| -rw-r--r-- | arch/um/Kconfig.um | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/um/Kconfig.net b/arch/um/Kconfig.net index 3160b1a5adb7..820a56f00332 100644 --- a/arch/um/Kconfig.net +++ b/arch/um/Kconfig.net @@ -157,7 +157,7 @@ config UML_NET_MCAST config UML_NET_PCAP bool "pcap transport" - depends on UML_NET && EXPERIMENTAL + depends on UML_NET help The pcap transport makes a pcap packet stream on the host look like an ethernet device inside UML. This is useful for making diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um index bf87f25eb2de..a7520c90f62d 100644 --- a/arch/um/Kconfig.um +++ b/arch/um/Kconfig.um @@ -45,8 +45,8 @@ config HOSTFS say Y or M here; otherwise say N. config HPPFS - tristate "HoneyPot ProcFS (EXPERIMENTAL)" - depends on EXPERIMENTAL && PROC_FS + tristate "HoneyPot ProcFS" + depends on PROC_FS help hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc entries to be overridden, removed, or fabricated from the host. @@ -96,7 +96,7 @@ config MAGIC_SYSRQ unless you really know what this hack does. config SMP - bool "Symmetric multi-processing support (EXPERIMENTAL)" + bool "Symmetric multi-processing support" default n depends on BROKEN help @@ -126,7 +126,7 @@ config NR_CPUS default "32" config HIGHMEM - bool "Highmem support (EXPERIMENTAL)" + bool "Highmem support" depends on !64BIT && BROKEN default n help |