Merge tag 'clang-features-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0045e1b44190213e75a098390f18271c851d86ec..867e7936dbc548a7dbc495c7f8fd54a628ffe1ad 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -103,8 +103,8 @@ config X86
        select ARCH_SUPPORTS_DEBUG_PAGEALLOC
        select ARCH_SUPPORTS_NUMA_BALANCING     if X86_64
        select ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP       if NR_CPUS <= 4096
-       select ARCH_SUPPORTS_LTO_CLANG          if X86_64
-       select ARCH_SUPPORTS_LTO_CLANG_THIN     if X86_64
+       select ARCH_SUPPORTS_LTO_CLANG
+       select ARCH_SUPPORTS_LTO_CLANG_THIN
        select ARCH_USE_BUILTIN_BSWAP
        select ARCH_USE_MEMTEST
        select ARCH_USE_QUEUED_RWLOCKS
@@ -113,6 +113,7 @@ config X86
        select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH
        select ARCH_WANT_DEFAULT_BPF_JIT        if X86_64
        select ARCH_WANTS_DYNAMIC_TASK_STRUCT
+       select ARCH_WANTS_NO_INSTR
        select ARCH_WANT_HUGE_PMD_SHARE
        select ARCH_WANT_LD_ORPHAN_WARN
        select ARCH_WANTS_THP_SWAP              if X86_64
@@ -1597,7 +1598,7 @@ config NODES_SHIFT
        default "10" if MAXSMP
        default "6" if X86_64
        default "3"
-       depends on NEED_MULTIPLE_NODES
+       depends on NUMA
        help
          Specify the maximum number of NUMA Nodes available on the target
          system.  Increases memory reserved to accommodate various tables.
@@ -1693,35 +1694,6 @@ config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
          Set whether the default state of memory_corruption_check is
          on or off.
 
-config X86_RESERVE_LOW
-       int "Amount of low memory, in kilobytes, to reserve for the BIOS"
-       default 64
-       range 4 640
-       help
-         Specify the amount of low memory to reserve for the BIOS.
-
-         The first page contains BIOS data structures that the kernel
-         must not use, so that page must always be reserved.
-
-         By default we reserve the first 64K of physical RAM, as a
-         number of BIOSes are known to corrupt that memory range
-         during events such as suspend/resume or monitor cable
-         insertion, so it must not be used by the kernel.
-
-         You can set this to 4 if you are absolutely sure that you
-         trust the BIOS to get all its memory reservations and usages
-         right.  If you know your BIOS have problems beyond the
-         default 64K area, you can set this to 640 to avoid using the
-         entire low memory range.
-
-         If you have doubts about the BIOS (e.g. suspend/resume does
-         not work or there's kernel crashes after certain hardware
-         hotplug events) then you might want to enable
-         X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check
-         typical corruption patterns.
-
-         Leave this to the default value of 64 if you are unsure.
-
 config MATH_EMULATION
        bool
        depends on MODIFY_LDT_SYSCALL