Skip to content

Commit 6ea3038

Browse files
committed
arch/x86: 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: Thomas Gleixner <tglx@linutronix.de> CC: Ingo Molnar <mingo@redhat.com> CC: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Ingo Molnar <mingo@kernel.org>
1 parent 75dacf5 commit 6ea3038

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

arch/x86/Kconfig

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ config ARCH_SUPPORTS_DEBUG_PAGEALLOC
222222

223223
config HAVE_INTEL_TXT
224224
def_bool y
225-
depends on EXPERIMENTAL && INTEL_IOMMU && ACPI
225+
depends on INTEL_IOMMU && ACPI
226226

227227
config X86_32_SMP
228228
def_bool y
@@ -617,7 +617,7 @@ config PARAVIRT
617617

618618
config PARAVIRT_SPINLOCKS
619619
bool "Paravirtualization layer for spinlocks"
620-
depends on PARAVIRT && SMP && EXPERIMENTAL
620+
depends on PARAVIRT && SMP
621621
---help---
622622
Paravirtualized spinlocks allow a pvops backend to replace the
623623
spinlock implementation with something virtualization-friendly
@@ -729,7 +729,7 @@ config GART_IOMMU
729729
config CALGARY_IOMMU
730730
bool "IBM Calgary IOMMU support"
731731
select SWIOTLB
732-
depends on X86_64 && PCI && EXPERIMENTAL
732+
depends on X86_64 && PCI
733733
---help---
734734
Support for hardware IOMMUs in IBM's xSeries x366 and x460
735735
systems. Needed to run systems with more than 3GB of memory
@@ -771,7 +771,7 @@ config IOMMU_HELPER
771771

772772
config MAXSMP
773773
bool "Enable Maximum number of SMP Processors and NUMA Nodes"
774-
depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL
774+
depends on X86_64 && SMP && DEBUG_KERNEL
775775
select CPUMASK_OFFSTACK
776776
---help---
777777
Enable maximum number of CPUS and NUMA Nodes for this architecture.
@@ -1107,7 +1107,6 @@ config HIGHMEM64G
11071107
endchoice
11081108

11091109
choice
1110-
depends on EXPERIMENTAL
11111110
prompt "Memory split" if EXPERT
11121111
default VMSPLIT_3G
11131112
depends on X86_32
@@ -1184,7 +1183,7 @@ config DIRECT_GBPAGES
11841183
config NUMA
11851184
bool "Numa Memory Allocation and Scheduler Support"
11861185
depends on SMP
1187-
depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)
1186+
depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI))
11881187
default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
11891188
---help---
11901189
Enable NUMA (Non Uniform Memory Access) support.
@@ -1279,7 +1278,7 @@ config ARCH_DISCONTIGMEM_DEFAULT
12791278

12801279
config ARCH_SPARSEMEM_ENABLE
12811280
def_bool y
1282-
depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD
1281+
depends on X86_64 || NUMA || X86_32 || X86_32_NON_STANDARD
12831282
select SPARSEMEM_STATIC if X86_32
12841283
select SPARSEMEM_VMEMMAP_ENABLE if X86_64
12851284

@@ -1593,8 +1592,7 @@ config CRASH_DUMP
15931592
For more details see Documentation/kdump/kdump.txt
15941593

15951594
config KEXEC_JUMP
1596-
bool "kexec jump (EXPERIMENTAL)"
1597-
depends on EXPERIMENTAL
1595+
bool "kexec jump"
15981596
depends on KEXEC && HIBERNATION
15991597
---help---
16001598
Jump between original kernel and kexeced kernel and invoke
@@ -2037,7 +2035,7 @@ config PCI_MMCONFIG
20372035

20382036
config PCI_CNB20LE_QUIRK
20392037
bool "Read CNB20LE Host Bridge Windows" if EXPERT
2040-
depends on PCI && EXPERIMENTAL
2038+
depends on PCI
20412039
help
20422040
Read the PCI windows out of the CNB20LE host bridge. This allows
20432041
PCI hotplug to work on systems with the CNB20LE chipset which do
@@ -2231,8 +2229,8 @@ config IA32_AOUT
22312229
Support old a.out binaries in the 32bit emulation.
22322230

22332231
config X86_X32
2234-
bool "x32 ABI for 64-bit mode (EXPERIMENTAL)"
2235-
depends on X86_64 && IA32_EMULATION && EXPERIMENTAL
2232+
bool "x32 ABI for 64-bit mode"
2233+
depends on X86_64 && IA32_EMULATION
22362234
---help---
22372235
Include code to run binaries for the x32 native 32-bit ABI
22382236
for 64-bit processors. An x32 process gets access to the

0 commit comments

Comments
 (0)