aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-01-16 21:53:14 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-21 17:43:11 -0500
commitd6f94fa0f37e5b33dd7d00880e959bfbc3329267 (patch)
treed4428ddd17de9d0e33abde96aa5c0219ca0409a0 /arch/arm
parentb7e17a10edf3638bb3e42621389448892a9cce6e (diff)
arch/arm: 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: Russell King <linux@arm.linux.org.uk> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig19
-rw-r--r--arch/arm/Kconfig.debug2
2 files changed, 9 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 67874b82a4ed..62c53dc9d7e0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1531,7 +1531,6 @@ config SMP
1531 1531
1532config SMP_ON_UP 1532config SMP_ON_UP
1533 bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)" 1533 bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"
1534 depends on EXPERIMENTAL
1535 depends on SMP && !XIP_KERNEL 1534 depends on SMP && !XIP_KERNEL
1536 default y 1535 default y
1537 help 1536 help
@@ -1719,7 +1718,7 @@ config AEABI
1719 1718
1720config OABI_COMPAT 1719config OABI_COMPAT
1721 bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)" 1720 bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)"
1722 depends on AEABI && EXPERIMENTAL && !THUMB2_KERNEL 1721 depends on AEABI && !THUMB2_KERNEL
1723 default y 1722 default y
1724 help 1723 help
1725 This option preserves the old syscall interface along with the 1724 This option preserves the old syscall interface along with the
@@ -1843,7 +1842,6 @@ config SECCOMP
1843 1842
1844config CC_STACKPROTECTOR 1843config CC_STACKPROTECTOR
1845 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" 1844 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
1846 depends on EXPERIMENTAL
1847 help 1845 help
1848 This option turns on the -fstack-protector GCC feature. This 1846 This option turns on the -fstack-protector GCC feature. This
1849 feature puts, at the beginning of functions, a canary value on 1847 feature puts, at the beginning of functions, a canary value on
@@ -1860,7 +1858,7 @@ config XEN_DOM0
1860 1858
1861config XEN 1859config XEN
1862 bool "Xen guest support on ARM (EXPERIMENTAL)" 1860 bool "Xen guest support on ARM (EXPERIMENTAL)"
1863 depends on EXPERIMENTAL && ARM && OF 1861 depends on ARM && OF
1864 depends on CPU_V7 && !CPU_V6 1862 depends on CPU_V7 && !CPU_V6
1865 help 1863 help
1866 Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. 1864 Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
@@ -1929,7 +1927,7 @@ config ZBOOT_ROM
1929 1927
1930choice 1928choice
1931 prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)" 1929 prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)"
1932 depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL 1930 depends on ZBOOT_ROM && ARCH_SH7372
1933 default ZBOOT_ROM_NONE 1931 default ZBOOT_ROM_NONE
1934 help 1932 help
1935 Include experimental SD/MMC loading code in the ROM-able zImage. 1933 Include experimental SD/MMC loading code in the ROM-able zImage.
@@ -1958,7 +1956,7 @@ endchoice
1958 1956
1959config ARM_APPENDED_DTB 1957config ARM_APPENDED_DTB
1960 bool "Use appended device tree blob to zImage (EXPERIMENTAL)" 1958 bool "Use appended device tree blob to zImage (EXPERIMENTAL)"
1961 depends on OF && !ZBOOT_ROM && EXPERIMENTAL 1959 depends on OF && !ZBOOT_ROM
1962 help 1960 help
1963 With this option, the boot code will look for a device tree binary 1961 With this option, the boot code will look for a device tree binary
1964 (DTB) appended to zImage 1962 (DTB) appended to zImage
@@ -2076,7 +2074,7 @@ config XIP_PHYS_ADDR
2076 2074
2077config KEXEC 2075config KEXEC
2078 bool "Kexec system call (EXPERIMENTAL)" 2076 bool "Kexec system call (EXPERIMENTAL)"
2079 depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU) 2077 depends on (!SMP || HOTPLUG_CPU)
2080 help 2078 help
2081 kexec is a system call that implements the ability to shutdown your 2079 kexec is a system call that implements the ability to shutdown your
2082 current kernel, and to start another kernel. It is like a reboot 2080 current kernel, and to start another kernel. It is like a reboot
@@ -2098,7 +2096,6 @@ config ATAGS_PROC
2098 2096
2099config CRASH_DUMP 2097config CRASH_DUMP
2100 bool "Build kdump crash kernel (EXPERIMENTAL)" 2098 bool "Build kdump crash kernel (EXPERIMENTAL)"
2101 depends on EXPERIMENTAL
2102 help 2099 help
2103 Generate crash dump after being started by kexec. This should 2100 Generate crash dump after being started by kexec. This should
2104 be normally only set in special crash dump kernels which are 2101 be normally only set in special crash dump kernels which are
@@ -2165,7 +2162,7 @@ config CPU_FREQ_S3C
2165 2162
2166config CPU_FREQ_S3C24XX 2163config CPU_FREQ_S3C24XX
2167 bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" 2164 bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"
2168 depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL 2165 depends on ARCH_S3C24XX && CPU_FREQ
2169 select CPU_FREQ_S3C 2166 select CPU_FREQ_S3C
2170 help 2167 help
2171 This enables the CPUfreq driver for the Samsung S3C24XX family 2168 This enables the CPUfreq driver for the Samsung S3C24XX family
@@ -2177,7 +2174,7 @@ config CPU_FREQ_S3C24XX
2177 2174
2178config CPU_FREQ_S3C24XX_PLL 2175config CPU_FREQ_S3C24XX_PLL
2179 bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" 2176 bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
2180 depends on CPU_FREQ_S3C24XX && EXPERIMENTAL 2177 depends on CPU_FREQ_S3C24XX
2181 help 2178 help
2182 Compile in support for changing the PLL frequency from the 2179 Compile in support for changing the PLL frequency from the
2183 S3C24XX series CPUfreq driver. The PLL takes time to settle 2180 S3C24XX series CPUfreq driver. The PLL takes time to settle
@@ -2240,7 +2237,7 @@ config FPE_NWFPE_XP
2240 2237
2241config FPE_FASTFPE 2238config FPE_FASTFPE
2242 bool "FastFPE math emulation (EXPERIMENTAL)" 2239 bool "FastFPE math emulation (EXPERIMENTAL)"
2243 depends on (!AEABI || OABI_COMPAT) && !CPU_32v3 && EXPERIMENTAL 2240 depends on (!AEABI || OABI_COMPAT) && !CPU_32v3
2244 ---help--- 2241 ---help---
2245 Say Y here to include the FAST floating point emulator in the kernel. 2242 Say Y here to include the FAST floating point emulator in the kernel.
2246 This is an experimental much faster emulator which now also has full 2243 This is an experimental much faster emulator which now also has full
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 661030d6bc6c..fc2a591e1676 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -32,7 +32,7 @@ config FRAME_POINTER
32 32
33config ARM_UNWIND 33config ARM_UNWIND
34 bool "Enable stack unwinding support (EXPERIMENTAL)" 34 bool "Enable stack unwinding support (EXPERIMENTAL)"
35 depends on AEABI && EXPERIMENTAL 35 depends on AEABI
36 default y 36 default y
37 help 37 help
38 This option enables stack unwinding support in the kernel 38 This option enables stack unwinding support in the kernel