瀏覽代碼

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>
Kees Cook 13 年之前
父節點
當前提交
0d57af1ec7
共有 3 個文件被更改,包括 9 次插入11 次删除
  1. 6 7
      arch/sh/Kconfig
  2. 1 2
      arch/sh/Kconfig.cpu
  3. 2 2
      arch/sh/mm/Kconfig

+ 6 - 7
arch/sh/Kconfig

@@ -648,7 +648,7 @@ source kernel/Kconfig.hz
 
 
 config KEXEC
 config KEXEC
 	bool "kexec system call (EXPERIMENTAL)"
 	bool "kexec system call (EXPERIMENTAL)"
-	depends on SUPERH32 && EXPERIMENTAL && MMU
+	depends on SUPERH32 && MMU
 	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
@@ -665,7 +665,7 @@ config KEXEC
 
 
 config CRASH_DUMP
 config CRASH_DUMP
 	bool "kernel crash dumps (EXPERIMENTAL)"
 	bool "kernel crash dumps (EXPERIMENTAL)"
-	depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP
+	depends on SUPERH32 && BROKEN_ON_SMP
 	help
 	help
 	  Generate crash dump after being started by kexec.
 	  Generate crash dump after being started by kexec.
 	  This should be normally only set in special crash dump kernels
 	  This should be normally only set in special crash dump kernels
@@ -679,7 +679,7 @@ config CRASH_DUMP
 
 
 config KEXEC_JUMP
 config KEXEC_JUMP
 	bool "kexec jump (EXPERIMENTAL)"
 	bool "kexec jump (EXPERIMENTAL)"
-	depends on SUPERH32 && KEXEC && HIBERNATION && EXPERIMENTAL
+	depends on SUPERH32 && KEXEC && HIBERNATION
 	help
 	help
 	  Jump between original kernel and kexeced kernel and invoke
 	  Jump between original kernel and kexeced kernel and invoke
 	  code via KEXEC
 	  code via KEXEC
@@ -713,7 +713,7 @@ 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 SUPERH32 && EXPERIMENTAL
+	depends on SUPERH32
 	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
@@ -764,7 +764,7 @@ config NR_CPUS
 
 
 config HOTPLUG_CPU
 config HOTPLUG_CPU
 	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
 	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-	depends on SMP && HOTPLUG && EXPERIMENTAL
+	depends on SMP && HOTPLUG
 	help
 	help
 	  Say Y here to experiment with turning CPUs off and on.  CPUs
 	  Say Y here to experiment with turning CPUs off and on.  CPUs
 	  can be controlled through /sys/devices/system/cpu.
 	  can be controlled through /sys/devices/system/cpu.
@@ -843,7 +843,7 @@ config ENTRY_OFFSET
 
 
 config ROMIMAGE_MMCIF
 config ROMIMAGE_MMCIF
 	bool "Include MMCIF loader in romImage (EXPERIMENTAL)"
 	bool "Include MMCIF loader in romImage (EXPERIMENTAL)"
-	depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL
+	depends on CPU_SUBTYPE_SH7724
 	help
 	help
 	  Say Y here to include experimental MMCIF loading code in
 	  Say Y here to include experimental MMCIF loading code in
 	  romImage. With this enabled it is possible to write the romImage
 	  romImage. With this enabled it is possible to write the romImage
@@ -929,7 +929,6 @@ source "fs/Kconfig.binfmt"
 endmenu
 endmenu
 
 
 menu "Power management options (EXPERIMENTAL)"
 menu "Power management options (EXPERIMENTAL)"
-depends on EXPERIMENTAL
 
 
 source "kernel/power/Kconfig"
 source "kernel/power/Kconfig"
 
 

+ 1 - 2
arch/sh/Kconfig.cpu

@@ -33,7 +33,7 @@ config SH64_FPU_DENORM_FLUSH
 config SH_FPU_EMU
 config SH_FPU_EMU
 	def_bool n
 	def_bool n
 	prompt "FPU emulation support"
 	prompt "FPU emulation support"
-	depends on !SH_FPU && EXPERIMENTAL
+	depends on !SH_FPU
 	help
 	help
 	  Selecting this option will enable support for software FPU emulation.
 	  Selecting this option will enable support for software FPU emulation.
 	  Most SH-3 users will want to say Y here, whereas most SH-4 users will
 	  Most SH-3 users will want to say Y here, whereas most SH-4 users will
@@ -68,7 +68,6 @@ config SH_STORE_QUEUES
 
 
 config SPECULATIVE_EXECUTION
 config SPECULATIVE_EXECUTION
 	bool "Speculative subroutine return"
 	bool "Speculative subroutine return"
-	depends on EXPERIMENTAL
 	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786
 	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786
 	help
 	help
 	  This enables support for a speculative instruction fetch for
 	  This enables support for a speculative instruction fetch for

+ 2 - 2
arch/sh/mm/Kconfig

@@ -83,7 +83,7 @@ config 32BIT
 
 
 config PMB
 config PMB
 	bool "Support 32-bit physical addressing through PMB"
 	bool "Support 32-bit physical addressing through PMB"
-	depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP
+	depends on MMU && CPU_SH4A && !CPU_SH4AL_DSP
 	select 32BIT
 	select 32BIT
 	select UNCACHED_MAPPING
 	select UNCACHED_MAPPING
 	help
 	help
@@ -110,7 +110,7 @@ config VSYSCALL
 
 
 config NUMA
 config NUMA
 	bool "Non Uniform Memory Access (NUMA) Support"
 	bool "Non Uniform Memory Access (NUMA) Support"
-	depends on MMU && SYS_SUPPORTS_NUMA && EXPERIMENTAL
+	depends on MMU && SYS_SUPPORTS_NUMA
 	select ARCH_WANT_NUMA_VARIABLE_LOCALITY
 	select ARCH_WANT_NUMA_VARIABLE_LOCALITY
 	default n
 	default n
 	help
 	help