Skip to content

Commit

Permalink
arch/um: remove depends on CONFIG_EXPERIMENTAL
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kees Cook committed Jan 11, 2013
1 parent b186ba6 commit 75dacf5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/um/Kconfig.net
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions arch/um/Kconfig.um
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 75dacf5

Please sign in to comment.