Merge tag 'asm-generic-timers-5.11' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0498d75..a8bd298 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -14,10 +14,11 @@ config X86_32
        select ARCH_WANT_IPC_PARSE_VERSION
        select CLKSRC_I8253
        select CLONE_BACKWARDS
+       select GENERIC_VDSO_32
        select HAVE_DEBUG_STACKOVERFLOW
+       select KMAP_LOCAL
        select MODULES_USE_ELF_REL
        select OLD_SIGACTION
-       select GENERIC_VDSO_32
 
 config X86_64
        def_bool y
@@ -91,7 +92,9 @@ config X86
        select ARCH_STACKWALK
        select ARCH_SUPPORTS_ACPI
        select ARCH_SUPPORTS_ATOMIC_RMW
+       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_USE_BUILTIN_BSWAP
        select ARCH_USE_QUEUED_RWLOCKS
        select ARCH_USE_QUEUED_SPINLOCKS
@@ -100,6 +103,7 @@ config X86
        select ARCH_WANT_DEFAULT_BPF_JIT        if X86_64
        select ARCH_WANTS_DYNAMIC_TASK_STRUCT
        select ARCH_WANT_HUGE_PMD_SHARE
+       select ARCH_WANT_LD_ORPHAN_WARN
        select ARCH_WANTS_THP_SWAP              if X86_64
        select BUILDTIME_TABLE_SORT
        select CLKEVT_I8253
@@ -161,6 +165,7 @@ config X86
        select HAVE_CMPXCHG_DOUBLE
        select HAVE_CMPXCHG_LOCAL
        select HAVE_CONTEXT_TRACKING            if X86_64
+       select HAVE_CONTEXT_TRACKING_OFFSTACK   if HAVE_CONTEXT_TRACKING
        select HAVE_C_RECORDMCOUNT
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DMA_CONTIGUOUS
@@ -197,6 +202,7 @@ config X86
        select HAVE_MIXED_BREAKPOINTS_REGS
        select HAVE_MOD_ARCH_SPECIFIC
        select HAVE_MOVE_PMD
+       select HAVE_MOVE_PUD
        select HAVE_NMI
        select HAVE_OPROFILE
        select HAVE_OPTPROBES
@@ -328,9 +334,6 @@ config ZONE_DMA32
 config AUDIT_ARCH
        def_bool y if X86_64
 
-config ARCH_SUPPORTS_DEBUG_PAGEALLOC
-       def_bool y
-
 config KASAN_SHADOW_OFFSET
        hex
        depends on KASAN
@@ -1929,6 +1932,23 @@ config X86_INTEL_TSX_MODE_AUTO
          side channel attacks- equals the tsx=auto command line parameter.
 endchoice
 
+config X86_SGX
+       bool "Software Guard eXtensions (SGX)"
+       depends on X86_64 && CPU_SUP_INTEL
+       depends on CRYPTO=y
+       depends on CRYPTO_SHA256=y
+       select SRCU
+       select MMU_NOTIFIER
+       help
+         Intel(R) Software Guard eXtensions (SGX) is a set of CPU instructions
+         that can be used by applications to set aside private regions of code
+         and data, referred to as enclaves. An enclave's private memory can
+         only be accessed by code running within the enclave. Accesses from
+         outside the enclave, including other enclaves, are disallowed by
+         hardware.
+
+         If unsure, say N.
+
 config EFI
        bool "EFI runtime service support"
        depends on ACPI