diff options
author | Kees Cook <keescook@chromium.org> | 2013-01-16 21:53:25 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 17:43:13 -0500 |
commit | 642e56ff5318e9ef742c0ac5c2e16b96902c50a0 (patch) | |
tree | ad746b23111711f6a004fee5d110f3479d0a4302 /arch/powerpc/Kconfig | |
parent | e274d0bcab5240c1ce151a3072da0baf5aaaacde (diff) |
arch/powerpc: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 17903f1f356b..e027f04f0bf7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -334,7 +334,7 @@ config SWIOTLB | |||
334 | 334 | ||
335 | config HOTPLUG_CPU | 335 | config HOTPLUG_CPU |
336 | bool "Support for enabling/disabling CPUs" | 336 | bool "Support for enabling/disabling CPUs" |
337 | depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || \ | 337 | depends on SMP && HOTPLUG && (PPC_PSERIES || \ |
338 | PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC)) | 338 | PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC)) |
339 | ---help--- | 339 | ---help--- |
340 | Say Y here to be able to disable and re-enable individual | 340 | Say Y here to be able to disable and re-enable individual |
@@ -356,8 +356,8 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE | |||
356 | def_bool y | 356 | def_bool y |
357 | 357 | ||
358 | config KEXEC | 358 | config KEXEC |
359 | bool "kexec system call (EXPERIMENTAL)" | 359 | bool "kexec system call" |
360 | depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) && EXPERIMENTAL | 360 | depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) |
361 | help | 361 | help |
362 | kexec is a system call that implements the ability to shutdown your | 362 | kexec is a system call that implements the ability to shutdown your |
363 | current kernel, and to start another kernel. It is like a reboot | 363 | current kernel, and to start another kernel. It is like a reboot |
@@ -852,8 +852,8 @@ config LOWMEM_CAM_NUM | |||
852 | default 3 | 852 | default 3 |
853 | 853 | ||
854 | config DYNAMIC_MEMSTART | 854 | config DYNAMIC_MEMSTART |
855 | bool "Enable page aligned dynamic load address for kernel (EXPERIMENTAL)" | 855 | bool "Enable page aligned dynamic load address for kernel" |
856 | depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x) | 856 | depends on ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x) |
857 | select NONSTATIC_KERNEL | 857 | select NONSTATIC_KERNEL |
858 | help | 858 | help |
859 | This option enables the kernel to be loaded at any page aligned | 859 | This option enables the kernel to be loaded at any page aligned |
@@ -870,8 +870,8 @@ config DYNAMIC_MEMSTART | |||
870 | This option is overridden by CONFIG_RELOCATABLE | 870 | This option is overridden by CONFIG_RELOCATABLE |
871 | 871 | ||
872 | config RELOCATABLE | 872 | config RELOCATABLE |
873 | bool "Build a relocatable kernel (EXPERIMENTAL)" | 873 | bool "Build a relocatable kernel" |
874 | depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && 44x | 874 | depends on ADVANCED_OPTIONS && FLATMEM && 44x |
875 | select NONSTATIC_KERNEL | 875 | select NONSTATIC_KERNEL |
876 | help | 876 | help |
877 | This builds a kernel image that is capable of running at the | 877 | This builds a kernel image that is capable of running at the |