Skip to content

Commit 75dacf5

Browse files
committed
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>
1 parent b186ba6 commit 75dacf5

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arch/um/Kconfig.net

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ config UML_NET_MCAST
157157

158158
config UML_NET_PCAP
159159
bool "pcap transport"
160-
depends on UML_NET && EXPERIMENTAL
160+
depends on UML_NET
161161
help
162162
The pcap transport makes a pcap packet stream on the host look
163163
like an ethernet device inside UML. This is useful for making

arch/um/Kconfig.um

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ config HOSTFS
4545
say Y or M here; otherwise say N.
4646

4747
config HPPFS
48-
tristate "HoneyPot ProcFS (EXPERIMENTAL)"
49-
depends on EXPERIMENTAL && PROC_FS
48+
tristate "HoneyPot ProcFS"
49+
depends on PROC_FS
5050
help
5151
hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc
5252
entries to be overridden, removed, or fabricated from the host.
@@ -96,7 +96,7 @@ config MAGIC_SYSRQ
9696
unless you really know what this hack does.
9797

9898
config SMP
99-
bool "Symmetric multi-processing support (EXPERIMENTAL)"
99+
bool "Symmetric multi-processing support"
100100
default n
101101
depends on BROKEN
102102
help
@@ -126,7 +126,7 @@ config NR_CPUS
126126
default "32"
127127

128128
config HIGHMEM
129-
bool "Highmem support (EXPERIMENTAL)"
129+
bool "Highmem support"
130130
depends on !64BIT && BROKEN
131131
default n
132132
help

0 commit comments

Comments
 (0)