瀏覽代碼

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>
Kees Cook 12 年之前
父節點
當前提交
d6f94fa0f3
共有 2 個文件被更改,包括 9 次插入12 次删除
  1. 8 11
      arch/arm/Kconfig
  2. 1 1
      arch/arm/Kconfig.debug

+ 8 - 11
arch/arm/Kconfig

@@ -1531,7 +1531,6 @@ config SMP
 
 
 config SMP_ON_UP
 config SMP_ON_UP
 	bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"
 	bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
 	depends on SMP && !XIP_KERNEL
 	depends on SMP && !XIP_KERNEL
 	default y
 	default y
 	help
 	help
@@ -1719,7 +1718,7 @@ config AEABI
 
 
 config OABI_COMPAT
 config OABI_COMPAT
 	bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)"
 	bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)"
-	depends on AEABI && EXPERIMENTAL && !THUMB2_KERNEL
+	depends on AEABI && !THUMB2_KERNEL
 	default y
 	default y
 	help
 	help
 	  This option preserves the old syscall interface along with the
 	  This option preserves the old syscall interface along with the
@@ -1843,7 +1842,6 @@ config SECCOMP
 
 
 config CC_STACKPROTECTOR
 config CC_STACKPROTECTOR
 	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
 	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
 	help
 	help
 	  This option turns on the -fstack-protector GCC feature. This
 	  This option turns on the -fstack-protector GCC feature. This
 	  feature puts, at the beginning of functions, a canary value on
 	  feature puts, at the beginning of functions, a canary value on
@@ -1860,7 +1858,7 @@ config XEN_DOM0
 
 
 config XEN
 config XEN
 	bool "Xen guest support on ARM (EXPERIMENTAL)"
 	bool "Xen guest support on ARM (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && ARM && OF
+	depends on ARM && OF
 	depends on CPU_V7 && !CPU_V6
 	depends on CPU_V7 && !CPU_V6
 	help
 	help
 	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
 	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
@@ -1929,7 +1927,7 @@ config ZBOOT_ROM
 
 
 choice
 choice
 	prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)"
 	prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)"
-	depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL
+	depends on ZBOOT_ROM && ARCH_SH7372
 	default ZBOOT_ROM_NONE
 	default ZBOOT_ROM_NONE
 	help
 	help
 	  Include experimental SD/MMC loading code in the ROM-able zImage.
 	  Include experimental SD/MMC loading code in the ROM-able zImage.
@@ -1958,7 +1956,7 @@ endchoice
 
 
 config ARM_APPENDED_DTB
 config ARM_APPENDED_DTB
 	bool "Use appended device tree blob to zImage (EXPERIMENTAL)"
 	bool "Use appended device tree blob to zImage (EXPERIMENTAL)"
-	depends on OF && !ZBOOT_ROM && EXPERIMENTAL
+	depends on OF && !ZBOOT_ROM
 	help
 	help
 	  With this option, the boot code will look for a device tree binary
 	  With this option, the boot code will look for a device tree binary
 	  (DTB) appended to zImage
 	  (DTB) appended to zImage
@@ -2076,7 +2074,7 @@ config XIP_PHYS_ADDR
 
 
 config KEXEC
 config KEXEC
 	bool "Kexec system call (EXPERIMENTAL)"
 	bool "Kexec system call (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU)
+	depends on (!SMP || HOTPLUG_CPU)
 	help
 	help
 	  kexec is a system call that implements the ability to shutdown your
 	  kexec is a system call that implements the ability to shutdown your
 	  current kernel, and to start another kernel.  It is like a reboot
 	  current kernel, and to start another kernel.  It is like a reboot
@@ -2098,7 +2096,6 @@ config ATAGS_PROC
 
 
 config CRASH_DUMP
 config CRASH_DUMP
 	bool "Build kdump crash kernel (EXPERIMENTAL)"
 	bool "Build kdump crash kernel (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
 	help
 	help
 	  Generate crash dump after being started by kexec. This should
 	  Generate crash dump after being started by kexec. This should
 	  be normally only set in special crash dump kernels which are
 	  be normally only set in special crash dump kernels which are
@@ -2165,7 +2162,7 @@ config CPU_FREQ_S3C
 
 
 config CPU_FREQ_S3C24XX
 config CPU_FREQ_S3C24XX
 	bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"
 	bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"
-	depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL
+	depends on ARCH_S3C24XX && CPU_FREQ
 	select CPU_FREQ_S3C
 	select CPU_FREQ_S3C
 	help
 	help
 	  This enables the CPUfreq driver for the Samsung S3C24XX family
 	  This enables the CPUfreq driver for the Samsung S3C24XX family
@@ -2177,7 +2174,7 @@ config CPU_FREQ_S3C24XX
 
 
 config CPU_FREQ_S3C24XX_PLL
 config CPU_FREQ_S3C24XX_PLL
 	bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
 	bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
-	depends on CPU_FREQ_S3C24XX && EXPERIMENTAL
+	depends on CPU_FREQ_S3C24XX
 	help
 	help
 	  Compile in support for changing the PLL frequency from the
 	  Compile in support for changing the PLL frequency from the
 	  S3C24XX series CPUfreq driver. The PLL takes time to settle
 	  S3C24XX series CPUfreq driver. The PLL takes time to settle
@@ -2240,7 +2237,7 @@ config FPE_NWFPE_XP
 
 
 config FPE_FASTFPE
 config FPE_FASTFPE
 	bool "FastFPE math emulation (EXPERIMENTAL)"
 	bool "FastFPE math emulation (EXPERIMENTAL)"
-	depends on (!AEABI || OABI_COMPAT) && !CPU_32v3 && EXPERIMENTAL
+	depends on (!AEABI || OABI_COMPAT) && !CPU_32v3
 	---help---
 	---help---
 	  Say Y here to include the FAST floating point emulator in the kernel.
 	  Say Y here to include the FAST floating point emulator in the kernel.
 	  This is an experimental much faster emulator which now also has full
 	  This is an experimental much faster emulator which now also has full

+ 1 - 1
arch/arm/Kconfig.debug

@@ -32,7 +32,7 @@ config FRAME_POINTER
 
 
 config ARM_UNWIND
 config ARM_UNWIND
 	bool "Enable stack unwinding support (EXPERIMENTAL)"
 	bool "Enable stack unwinding support (EXPERIMENTAL)"
-	depends on AEABI && EXPERIMENTAL
+	depends on AEABI
 	default y
 	default y
 	help
 	help
 	  This option enables stack unwinding support in the kernel
 	  This option enables stack unwinding support in the kernel