diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/Kconfig | 13 | ||||
-rw-r--r-- | arch/sh/Kconfig.cpu | 3 | ||||
-rw-r--r-- | arch/sh/mm/Kconfig | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 9c833c585871..87f720037ff7 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -644,7 +644,7 @@ source kernel/Kconfig.hz | |||
644 | 644 | ||
645 | config KEXEC | 645 | config KEXEC |
646 | bool "kexec system call (EXPERIMENTAL)" | 646 | bool "kexec system call (EXPERIMENTAL)" |
647 | depends on SUPERH32 && EXPERIMENTAL && MMU | 647 | depends on SUPERH32 && MMU |
648 | help | 648 | help |
649 | kexec is a system call that implements the ability to shutdown your | 649 | kexec is a system call that implements the ability to shutdown your |
650 | current kernel, and to start another kernel. It is like a reboot | 650 | current kernel, and to start another kernel. It is like a reboot |
@@ -661,7 +661,7 @@ config KEXEC | |||
661 | 661 | ||
662 | config CRASH_DUMP | 662 | config CRASH_DUMP |
663 | bool "kernel crash dumps (EXPERIMENTAL)" | 663 | bool "kernel crash dumps (EXPERIMENTAL)" |
664 | depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP | 664 | depends on SUPERH32 && BROKEN_ON_SMP |
665 | help | 665 | help |
666 | Generate crash dump after being started by kexec. | 666 | Generate crash dump after being started by kexec. |
667 | This should be normally only set in special crash dump kernels | 667 | This should be normally only set in special crash dump kernels |
@@ -675,7 +675,7 @@ config CRASH_DUMP | |||
675 | 675 | ||
676 | config KEXEC_JUMP | 676 | config KEXEC_JUMP |
677 | bool "kexec jump (EXPERIMENTAL)" | 677 | bool "kexec jump (EXPERIMENTAL)" |
678 | depends on SUPERH32 && KEXEC && HIBERNATION && EXPERIMENTAL | 678 | depends on SUPERH32 && KEXEC && HIBERNATION |
679 | help | 679 | help |
680 | Jump between original kernel and kexeced kernel and invoke | 680 | Jump between original kernel and kexeced kernel and invoke |
681 | code via KEXEC | 681 | code via KEXEC |
@@ -709,7 +709,7 @@ config SECCOMP | |||
709 | 709 | ||
710 | config CC_STACKPROTECTOR | 710 | config CC_STACKPROTECTOR |
711 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 711 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
712 | depends on SUPERH32 && EXPERIMENTAL | 712 | depends on SUPERH32 |
713 | help | 713 | help |
714 | This option turns on the -fstack-protector GCC feature. This | 714 | This option turns on the -fstack-protector GCC feature. This |
715 | feature puts, at the beginning of functions, a canary value on | 715 | feature puts, at the beginning of functions, a canary value on |
@@ -760,7 +760,7 @@ config NR_CPUS | |||
760 | 760 | ||
761 | config HOTPLUG_CPU | 761 | config HOTPLUG_CPU |
762 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" | 762 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" |
763 | depends on SMP && HOTPLUG && EXPERIMENTAL | 763 | depends on SMP && HOTPLUG |
764 | help | 764 | help |
765 | Say Y here to experiment with turning CPUs off and on. CPUs | 765 | Say Y here to experiment with turning CPUs off and on. CPUs |
766 | can be controlled through /sys/devices/system/cpu. | 766 | can be controlled through /sys/devices/system/cpu. |
@@ -839,7 +839,7 @@ config ENTRY_OFFSET | |||
839 | 839 | ||
840 | config ROMIMAGE_MMCIF | 840 | config ROMIMAGE_MMCIF |
841 | bool "Include MMCIF loader in romImage (EXPERIMENTAL)" | 841 | bool "Include MMCIF loader in romImage (EXPERIMENTAL)" |
842 | depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL | 842 | depends on CPU_SUBTYPE_SH7724 |
843 | help | 843 | help |
844 | Say Y here to include experimental MMCIF loading code in | 844 | Say Y here to include experimental MMCIF loading code in |
845 | romImage. With this enabled it is possible to write the romImage | 845 | romImage. With this enabled it is possible to write the romImage |
@@ -925,7 +925,6 @@ source "fs/Kconfig.binfmt" | |||
925 | endmenu | 925 | endmenu |
926 | 926 | ||
927 | menu "Power management options (EXPERIMENTAL)" | 927 | menu "Power management options (EXPERIMENTAL)" |
928 | depends on EXPERIMENTAL | ||
929 | 928 | ||
930 | source "kernel/power/Kconfig" | 929 | source "kernel/power/Kconfig" |
931 | 930 | ||
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu index 770ff2d5b94d..05b518e90cf7 100644 --- a/arch/sh/Kconfig.cpu +++ b/arch/sh/Kconfig.cpu | |||
@@ -33,7 +33,7 @@ config SH64_FPU_DENORM_FLUSH | |||
33 | config SH_FPU_EMU | 33 | config SH_FPU_EMU |
34 | def_bool n | 34 | def_bool n |
35 | prompt "FPU emulation support" | 35 | prompt "FPU emulation support" |
36 | depends on !SH_FPU && EXPERIMENTAL | 36 | depends on !SH_FPU |
37 | help | 37 | help |
38 | Selecting this option will enable support for software FPU emulation. | 38 | Selecting this option will enable support for software FPU emulation. |
39 | Most SH-3 users will want to say Y here, whereas most SH-4 users will | 39 | Most SH-3 users will want to say Y here, whereas most SH-4 users will |
@@ -68,7 +68,6 @@ config SH_STORE_QUEUES | |||
68 | 68 | ||
69 | config SPECULATIVE_EXECUTION | 69 | config SPECULATIVE_EXECUTION |
70 | bool "Speculative subroutine return" | 70 | bool "Speculative subroutine return" |
71 | depends on EXPERIMENTAL | ||
72 | depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786 | 71 | depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786 |
73 | help | 72 | help |
74 | This enables support for a speculative instruction fetch for | 73 | This enables support for a speculative instruction fetch for |
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 0f7c852f355c..5a43a871e097 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
@@ -83,7 +83,7 @@ config 32BIT | |||
83 | 83 | ||
84 | config PMB | 84 | config PMB |
85 | bool "Support 32-bit physical addressing through PMB" | 85 | bool "Support 32-bit physical addressing through PMB" |
86 | depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP | 86 | depends on MMU && CPU_SH4A && !CPU_SH4AL_DSP |
87 | select 32BIT | 87 | select 32BIT |
88 | select UNCACHED_MAPPING | 88 | select UNCACHED_MAPPING |
89 | help | 89 | help |
@@ -110,7 +110,7 @@ config VSYSCALL | |||
110 | 110 | ||
111 | config NUMA | 111 | config NUMA |
112 | bool "Non Uniform Memory Access (NUMA) Support" | 112 | bool "Non Uniform Memory Access (NUMA) Support" |
113 | depends on MMU && SYS_SUPPORTS_NUMA && EXPERIMENTAL | 113 | depends on MMU && SYS_SUPPORTS_NUMA |
114 | select ARCH_WANT_NUMA_VARIABLE_LOCALITY | 114 | select ARCH_WANT_NUMA_VARIABLE_LOCALITY |
115 | default n | 115 | default n |
116 | help | 116 | help |