1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 561ccca7b1a7..e7fb8edb629b 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -332,7 +332,7 @@ config SWIOTLB
 config HOTPLUG_CPU
        bool "Support for enabling/disabling CPUs"
-        depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || \
+        depends on SMP && HOTPLUG && (PPC_PSERIES || \
        PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC))
        ---help---
          Say Y here to be able to disable and re-enable individual
@@ -354,8 +354,8 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
        def_bool y
 config KEXEC
-        bool "kexec system call (EXPERIMENTAL)"
+        bool "kexec system call"
-        depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) && EXPERIMENTAL
+        depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
@@ -850,8 +850,8 @@ config LOWMEM_CAM_NUM
        default 3
 config DYNAMIC_MEMSTART
-        bool "Enable page aligned dynamic load address for kernel (EXPERIMENTAL)"
+        bool "Enable page aligned dynamic load address for kernel"
-        depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x)
+        depends on ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x)
        select NONSTATIC_KERNEL
        help
          This option enables the kernel to be loaded at any page aligned
@@ -868,8 +868,8 @@ config DYNAMIC_MEMSTART
          This option is overridden by CONFIG_RELOCATABLE
 config RELOCATABLE
-        bool "Build a relocatable kernel (EXPERIMENTAL)"
+        bool "Build a relocatable kernel"
-        depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && 44x
+        depends on ADVANCED_OPTIONS && FLATMEM && 44x
        select NONSTATIC_KERNEL
        help
          This builds a kernel image that is capable of running at the

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 561ccca7b1a7..e7fb8edb629b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig
@@ -332,7 +332,7 @@ config SWIOTLB
332		332
333	config HOTPLUG_CPU	333	config HOTPLUG_CPU
334	bool "Support for enabling/disabling CPUs"	334	bool "Support for enabling/disabling CPUs"
335	depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES \|\| \	335	depends on SMP && HOTPLUG && (PPC_PSERIES \|\| \
336	PPC_PMAC \|\| PPC_POWERNV \|\| (PPC_85xx && !PPC_E500MC))	336	PPC_PMAC \|\| PPC_POWERNV \|\| (PPC_85xx && !PPC_E500MC))
337	---help---	337	---help---
338	Say Y here to be able to disable and re-enable individual	338	Say Y here to be able to disable and re-enable individual
@@ -354,8 +354,8 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
354	def_bool y	354	def_bool y
355		355
356	config KEXEC	356	config KEXEC
357	bool "kexec system call (EXPERIMENTAL)"	357	bool "kexec system call"
358	depends on (PPC_BOOK3S \|\| FSL_BOOKE \|\| (44x && !SMP)) && EXPERIMENTAL	358	depends on (PPC_BOOK3S \|\| FSL_BOOKE \|\| (44x && !SMP))
359	help	359	help
360	kexec is a system call that implements the ability to shutdown your	360	kexec is a system call that implements the ability to shutdown your
361	current kernel, and to start another kernel. It is like a reboot	361	current kernel, and to start another kernel. It is like a reboot
@@ -850,8 +850,8 @@ config LOWMEM_CAM_NUM
850	default 3	850	default 3
851		851
852	config DYNAMIC_MEMSTART	852	config DYNAMIC_MEMSTART
853	bool "Enable page aligned dynamic load address for kernel (EXPERIMENTAL)"	853	bool "Enable page aligned dynamic load address for kernel"
854	depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE \|\| 44x)	854	depends on ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE \|\| 44x)
855	select NONSTATIC_KERNEL	855	select NONSTATIC_KERNEL
856	help	856	help
857	This option enables the kernel to be loaded at any page aligned	857	This option enables the kernel to be loaded at any page aligned
@@ -868,8 +868,8 @@ config DYNAMIC_MEMSTART
868	This option is overridden by CONFIG_RELOCATABLE	868	This option is overridden by CONFIG_RELOCATABLE
869		869
870	config RELOCATABLE	870	config RELOCATABLE
871	bool "Build a relocatable kernel (EXPERIMENTAL)"	871	bool "Build a relocatable kernel"
872	depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && 44x	872	depends on ADVANCED_OPTIONS && FLATMEM && 44x
873	select NONSTATIC_KERNEL	873	select NONSTATIC_KERNEL
874	help	874	help
875	This builds a kernel image that is capable of running at the	875	This builds a kernel image that is capable of running at the