aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook2012-10-02 13:19:29 -0500
committerKees Cook2013-01-11 13:39:33 -0600
commit19c92399817995382522c09ca21e8784a028c023 (patch)
tree3d7f81f6aa8248572154a47b1b2216f22aa18f45 /init/Kconfig
parentd9777b8de415f2e699dcc4ce8825732ba8af732a (diff)
downloadkernel-19c92399817995382522c09ca21e8784a028c023.tar.gz
kernel-19c92399817995382522c09ca21e8784a028c023.tar.xz
kernel-19c92399817995382522c09ca21e8784a028c023.zip
init: 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: "Eric W. Biederman" <ebiederm@xmission.com> CC: Serge Hallyn <serge.hallyn@canonical.com> CC: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> CC: Andrew Morton <akpm@linux-foundation.org> CC: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig23
1 files changed, 10 insertions, 13 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 66eefd9ba73c..3020d81c05bc 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -220,7 +220,7 @@ config SYSVIPC_SYSCTL
220 220
221config POSIX_MQUEUE 221config POSIX_MQUEUE
222 bool "POSIX Message Queues" 222 bool "POSIX Message Queues"
223 depends on NET && EXPERIMENTAL 223 depends on NET
224 ---help--- 224 ---help---
225 POSIX variant of message queues is a part of IPC. In POSIX message 225 POSIX variant of message queues is a part of IPC. In POSIX message
226 queues every message has a priority which decides about succession 226 queues every message has a priority which decides about succession
@@ -366,7 +366,7 @@ config BSD_PROCESS_ACCT_V3
366 at <http://www.gnu.org/software/acct/>. 366 at <http://www.gnu.org/software/acct/>.
367 367
368config TASKSTATS 368config TASKSTATS
369 bool "Export task/process statistics through netlink (EXPERIMENTAL)" 369 bool "Export task/process statistics through netlink"
370 depends on NET 370 depends on NET
371 default n 371 default n
372 help 372 help
@@ -379,7 +379,7 @@ config TASKSTATS
379 Say N if unsure. 379 Say N if unsure.
380 380
381config TASK_DELAY_ACCT 381config TASK_DELAY_ACCT
382 bool "Enable per-task delay accounting (EXPERIMENTAL)" 382 bool "Enable per-task delay accounting"
383 depends on TASKSTATS 383 depends on TASKSTATS
384 help 384 help
385 Collect information on time spent by a task waiting for system 385 Collect information on time spent by a task waiting for system
@@ -390,7 +390,7 @@ config TASK_DELAY_ACCT
390 Say N if unsure. 390 Say N if unsure.
391 391
392config TASK_XACCT 392config TASK_XACCT
393 bool "Enable extended accounting over taskstats (EXPERIMENTAL)" 393 bool "Enable extended accounting over taskstats"
394 depends on TASKSTATS 394 depends on TASKSTATS
395 help 395 help
396 Collect extended task accounting data and send the data 396 Collect extended task accounting data and send the data
@@ -399,7 +399,7 @@ config TASK_XACCT
399 Say N if unsure. 399 Say N if unsure.
400 400
401config TASK_IO_ACCOUNTING 401config TASK_IO_ACCOUNTING
402 bool "Enable per-task storage I/O accounting (EXPERIMENTAL)" 402 bool "Enable per-task storage I/O accounting"
403 depends on TASK_XACCT 403 depends on TASK_XACCT
404 help 404 help
405 Collect information on the number of bytes of storage I/O which this 405 Collect information on the number of bytes of storage I/O which this
@@ -853,8 +853,8 @@ config MEMCG_SWAP_ENABLED
853 select this option (if, for some reason, they need to disable it 853 select this option (if, for some reason, they need to disable it
854 then swapaccount=0 does the trick). 854 then swapaccount=0 does the trick).
855config MEMCG_KMEM 855config MEMCG_KMEM
856 bool "Memory Resource Controller Kernel Memory accounting (EXPERIMENTAL)" 856 bool "Memory Resource Controller Kernel Memory accounting"
857 depends on MEMCG && EXPERIMENTAL 857 depends on MEMCG
858 depends on SLUB || SLAB 858 depends on SLUB || SLAB
859 help 859 help
860 The Kernel Memory extension for Memory Resource Controller can limit 860 The Kernel Memory extension for Memory Resource Controller can limit
@@ -866,7 +866,7 @@ config MEMCG_KMEM
866 866
867config CGROUP_HUGETLB 867config CGROUP_HUGETLB
868 bool "HugeTLB Resource Controller for Control Groups" 868 bool "HugeTLB Resource Controller for Control Groups"
869 depends on RESOURCE_COUNTERS && HUGETLB_PAGE && EXPERIMENTAL 869 depends on RESOURCE_COUNTERS && HUGETLB_PAGE
870 default n 870 default n
871 help 871 help
872 Provides a cgroup Resource Controller for HugeTLB pages. 872 Provides a cgroup Resource Controller for HugeTLB pages.
@@ -905,7 +905,6 @@ config FAIR_GROUP_SCHED
905 905
906config CFS_BANDWIDTH 906config CFS_BANDWIDTH
907 bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED" 907 bool "CPU bandwidth provisioning for FAIR_GROUP_SCHED"
908 depends on EXPERIMENTAL
909 depends on FAIR_GROUP_SCHED 908 depends on FAIR_GROUP_SCHED
910 default n 909 default n
911 help 910 help
@@ -917,7 +916,6 @@ config CFS_BANDWIDTH
917 916
918config RT_GROUP_SCHED 917config RT_GROUP_SCHED
919 bool "Group scheduling for SCHED_RR/FIFO" 918 bool "Group scheduling for SCHED_RR/FIFO"
920 depends on EXPERIMENTAL
921 depends on CGROUP_SCHED 919 depends on CGROUP_SCHED
922 default n 920 default n
923 help 921 help
@@ -999,8 +997,7 @@ config IPC_NS
999 different IPC objects in different namespaces. 997 different IPC objects in different namespaces.
1000 998
1001config USER_NS 999config USER_NS
1002 bool "User namespace (EXPERIMENTAL)" 1000 bool "User namespace"
1003 depends on EXPERIMENTAL
1004 depends on UIDGID_CONVERTED 1001 depends on UIDGID_CONVERTED
1005 select UIDGID_STRICT_TYPE_CHECKS 1002 select UIDGID_STRICT_TYPE_CHECKS
1006 1003
@@ -1581,7 +1578,7 @@ config MODULE_UNLOAD
1581 1578
1582config MODULE_FORCE_UNLOAD 1579config MODULE_FORCE_UNLOAD
1583 bool "Forced module unloading" 1580 bool "Forced module unloading"
1584 depends on MODULE_UNLOAD && EXPERIMENTAL 1581 depends on MODULE_UNLOAD
1585 help 1582 help
1586 This option allows you to force a module to unload, even if the 1583 This option allows you to force a module to unload, even if the
1587 kernel believes it is unsafe: the kernel will remove the module 1584 kernel believes it is unsafe: the kernel will remove the module