Merge tag 'pidfd-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner...

[sfrench/cifs-2.6.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 90e2640ade75416c9b328c970bf63754f0ccc951..e7212731cffb74c1da98cdbbb15cad5946b20849 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -14,6 +14,7 @@ config X86_32
        select ARCH_WANT_IPC_PARSE_VERSION
        select CLKSRC_I8253
        select CLONE_BACKWARDS
+       select HAVE_DEBUG_STACKOVERFLOW
        select MODULES_USE_ELF_REL
        select OLD_SIGACTION
 
@@ -28,7 +29,6 @@ config X86_64
        select MODULES_USE_ELF_RELA
        select NEED_DMA_MAP_STATE
        select SWIOTLB
-       select X86_DEV_DMA_OPS
        select ARCH_HAS_SYSCALL_WRAPPER
 
 #
@@ -44,7 +44,6 @@ config X86
        #
        select ACPI_LEGACY_TABLES_LOOKUP        if ACPI
        select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
-       select ANON_INODES
        select ARCH_32BIT_OFF_T                 if X86_32
        select ARCH_CLOCKSOURCE_DATA
        select ARCH_CLOCKSOURCE_INIT
@@ -65,6 +64,7 @@ config X86
        select ARCH_HAS_UACCESS_FLUSHCACHE      if X86_64
        select ARCH_HAS_UACCESS_MCSAFE          if X86_64 && X86_MCE
        select ARCH_HAS_SET_MEMORY
+       select ARCH_HAS_SET_DIRECT_MAP
        select ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_HAS_STRICT_MODULE_RWX
        select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE
@@ -139,7 +139,6 @@ config X86
        select HAVE_COPY_THREAD_TLS
        select HAVE_C_RECORDMCOUNT
        select HAVE_DEBUG_KMEMLEAK
-       select HAVE_DEBUG_STACKOVERFLOW
        select HAVE_DMA_CONTIGUOUS
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
@@ -700,8 +699,6 @@ config STA2X11
        bool "STA2X11 Companion Chip Support"
        depends on X86_32_NON_STANDARD && PCI
        select ARCH_HAS_PHYS_TO_DMA
-       select X86_DEV_DMA_OPS
-       select X86_DMA_REMAP
        select SWIOTLB
        select MFD_STA2X11
        select GPIOLIB
@@ -1319,8 +1316,16 @@ config MICROCODE_AMD
          processors will be enabled.
 
 config MICROCODE_OLD_INTERFACE
-       def_bool y
+       bool "Ancient loading interface (DEPRECATED)"
+       default n
        depends on MICROCODE
+       ---help---
+         DO NOT USE THIS! This is the ancient /dev/cpu/microcode interface
+         which was used by userspace tools like iucode_tool and microcode.ctl.
+         It is inadequate because it runs too late to be able to properly
+         load microcode on a machine and it needs special tools. Instead, you
+         should've switched to the early loading method with the initrd or
+         builtin microcode by now: Documentation/x86/microcode.txt
 
 config X86_MSR
        tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -1595,12 +1600,9 @@ config ARCH_FLATMEM_ENABLE
        depends on X86_32 && !NUMA
 
 config ARCH_DISCONTIGMEM_ENABLE
-       def_bool y
-       depends on NUMA && X86_32
-
-config ARCH_DISCONTIGMEM_DEFAULT
-       def_bool y
+       def_bool n
        depends on NUMA && X86_32
+       depends on BROKEN
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
@@ -1609,8 +1611,7 @@ config ARCH_SPARSEMEM_ENABLE
        select SPARSEMEM_VMEMMAP_ENABLE if X86_64
 
 config ARCH_SPARSEMEM_DEFAULT
-       def_bool y
-       depends on X86_64
+       def_bool X86_64 || (NUMA && X86_32)
 
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
@@ -2867,11 +2868,6 @@ config HAVE_ATOMIC_IOMAP
 
 config X86_DEV_DMA_OPS
        bool
-       depends on X86_64 || STA2X11
-
-config X86_DMA_REMAP
-       bool
-       depends on STA2X11
 
 config HAVE_GENERIC_GUP
        def_bool y