diff options
author | Kees Cook <keescook@chromium.org> | 2013-01-16 21:53:26 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 17:43:13 -0500 |
commit | 0d57af1ec7e278a49dd881d326484773e3866150 (patch) | |
tree | 71afc0760c23c8d7e5de0847d700bcfd550fc4cc /arch/sh/Kconfig | |
parent | 642e56ff5318e9ef742c0ac5c2e16b96902c50a0 (diff) |
arch/sh: 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: Paul Mundt <lethal@linux-sh.org>
CC: Tejun Heo <tj@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r-- | arch/sh/Kconfig | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index babc2b826c5c..47653799018e 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -648,7 +648,7 @@ source kernel/Kconfig.hz | |||
648 | 648 | ||
649 | config KEXEC | 649 | config KEXEC |
650 | bool "kexec system call (EXPERIMENTAL)" | 650 | bool "kexec system call (EXPERIMENTAL)" |
651 | depends on SUPERH32 && EXPERIMENTAL && MMU | 651 | depends on SUPERH32 && MMU |
652 | help | 652 | help |
653 | kexec is a system call that implements the ability to shutdown your | 653 | kexec is a system call that implements the ability to shutdown your |
654 | current kernel, and to start another kernel. It is like a reboot | 654 | current kernel, and to start another kernel. It is like a reboot |
@@ -665,7 +665,7 @@ config KEXEC | |||
665 | 665 | ||
666 | config CRASH_DUMP | 666 | config CRASH_DUMP |
667 | bool "kernel crash dumps (EXPERIMENTAL)" | 667 | bool "kernel crash dumps (EXPERIMENTAL)" |
668 | depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP | 668 | depends on SUPERH32 && BROKEN_ON_SMP |
669 | help | 669 | help |
670 | Generate crash dump after being started by kexec. | 670 | Generate crash dump after being started by kexec. |
671 | This should be normally only set in special crash dump kernels | 671 | This should be normally only set in special crash dump kernels |
@@ -679,7 +679,7 @@ config CRASH_DUMP | |||
679 | 679 | ||
680 | config KEXEC_JUMP | 680 | config KEXEC_JUMP |
681 | bool "kexec jump (EXPERIMENTAL)" | 681 | bool "kexec jump (EXPERIMENTAL)" |
682 | depends on SUPERH32 && KEXEC && HIBERNATION && EXPERIMENTAL | 682 | depends on SUPERH32 && KEXEC && HIBERNATION |
683 | help | 683 | help |
684 | Jump between original kernel and kexeced kernel and invoke | 684 | Jump between original kernel and kexeced kernel and invoke |
685 | code via KEXEC | 685 | code via KEXEC |
@@ -713,7 +713,7 @@ config SECCOMP | |||
713 | 713 | ||
714 | config CC_STACKPROTECTOR | 714 | config CC_STACKPROTECTOR |
715 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 715 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
716 | depends on SUPERH32 && EXPERIMENTAL | 716 | depends on SUPERH32 |
717 | help | 717 | help |
718 | This option turns on the -fstack-protector GCC feature. This | 718 | This option turns on the -fstack-protector GCC feature. This |
719 | feature puts, at the beginning of functions, a canary value on | 719 | feature puts, at the beginning of functions, a canary value on |
@@ -764,7 +764,7 @@ config NR_CPUS | |||
764 | 764 | ||
765 | config HOTPLUG_CPU | 765 | config HOTPLUG_CPU |
766 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" | 766 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" |
767 | depends on SMP && HOTPLUG && EXPERIMENTAL | 767 | depends on SMP && HOTPLUG |
768 | help | 768 | help |
769 | Say Y here to experiment with turning CPUs off and on. CPUs | 769 | Say Y here to experiment with turning CPUs off and on. CPUs |
770 | can be controlled through /sys/devices/system/cpu. | 770 | can be controlled through /sys/devices/system/cpu. |
@@ -843,7 +843,7 @@ config ENTRY_OFFSET | |||
843 | 843 | ||
844 | config ROMIMAGE_MMCIF | 844 | config ROMIMAGE_MMCIF |
845 | bool "Include MMCIF loader in romImage (EXPERIMENTAL)" | 845 | bool "Include MMCIF loader in romImage (EXPERIMENTAL)" |
846 | depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL | 846 | depends on CPU_SUBTYPE_SH7724 |
847 | help | 847 | help |
848 | Say Y here to include experimental MMCIF loading code in | 848 | Say Y here to include experimental MMCIF loading code in |
849 | romImage. With this enabled it is possible to write the romImage | 849 | romImage. With this enabled it is possible to write the romImage |
@@ -929,7 +929,6 @@ source "fs/Kconfig.binfmt" | |||
929 | endmenu | 929 | endmenu |
930 | 930 | ||
931 | menu "Power management options (EXPERIMENTAL)" | 931 | menu "Power management options (EXPERIMENTAL)" |
932 | depends on EXPERIMENTAL | ||
933 | 932 | ||
934 | source "kernel/power/Kconfig" | 933 | source "kernel/power/Kconfig" |
935 | 934 | ||