Merge tag 'kconfig-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-block.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fd5ac1d89d74388622ed186747f0d6a9a4a45bc6..4385fc9174e1f280c179ae5b7020adf0cde2a57c 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -66,7 +66,6 @@ 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_SG_CHAIN
        select ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_HAS_STRICT_MODULE_RWX
        select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE
@@ -90,7 +89,6 @@ config X86
        select CLOCKSOURCE_VALIDATE_LAST_CYCLE
        select CLOCKSOURCE_WATCHDOG
        select DCACHE_WORD_ACCESS
-       select DMA_DIRECT_OPS
        select EDAC_ATOMIC_SCRUB
        select EDAC_SUPPORT
        select GENERIC_CLOCKEVENTS
@@ -444,19 +442,23 @@ config RETPOLINE
          branches. Requires a compiler with -mindirect-branch=thunk-extern
          support for full protection. The kernel may run slower.
 
-         Without compiler support, at least indirect branches in assembler
-         code are eliminated. Since this includes the syscall entry path,
-         it is not entirely pointless.
-
-config INTEL_RDT
-       bool "Intel Resource Director Technology support"
-       depends on X86 && CPU_SUP_INTEL
+config RESCTRL
+       bool "Resource Control support"
+       depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD)
        select KERNFS
        help
-         Select to enable resource allocation and monitoring which are
-         sub-features of Intel Resource Director Technology(RDT). More
-         information about RDT can be found in the Intel x86
-         Architecture Software Developer Manual.
+         Enable Resource Control support.
+
+         Provide support for the allocation and monitoring of system resources
+         usage by the CPU.
+
+         Intel calls this Intel Resource Director Technology
+         (Intel(R) RDT). More information about RDT can be found in the
+         Intel x86 Architecture Software Developer Manual.
+
+         AMD calls this AMD Platform Quality of Service (AMD QoS).
+         More information about AMD QoS can be found in the AMD64 Technology
+         Platform Quality of Service Extensions manual.
 
          Say N if unsure.
 
@@ -800,6 +802,12 @@ config KVM_GUEST
          underlying device model, the host provides the guest with
          timing infrastructure such as time of day, and system time
 
+config PVH
+       bool "Support for running PVH guests"
+       ---help---
+         This option enables the PVH entry point for guest virtual machines
+         as specified in the x86/HVM direct boot ABI.
+
 config KVM_DEBUG_FS
        bool "Enable debug information for KVM Guests in debugfs"
        depends on KVM_GUEST && DEBUG_FS
@@ -1004,13 +1012,7 @@ config NR_CPUS
          to the kernel image.
 
 config SCHED_SMT
-       bool "SMT (Hyperthreading) scheduler support"
-       depends on SMP
-       ---help---
-         SMT scheduler support improves the CPU scheduler's decision making
-         when dealing with Intel Pentium 4 chips with HyperThreading at a
-         cost of slightly increased overhead in some places. If unsure say
-         N here.
+       def_bool y if SMP
 
 config SCHED_MC
        def_bool y