Merge tag 'squashfs-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b710efdec9a0afcd072660545cd5a4c4d33f8428..30c40f08a3d461346b06d4a8ebc7fa5acae121bf 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -632,6 +632,7 @@ config PARAVIRT_DEBUG
 config PARAVIRT_SPINLOCKS
        bool "Paravirtualization layer for spinlocks"
        depends on PARAVIRT && SMP
+       select UNINLINE_SPIN_UNLOCK
        ---help---
          Paravirtualized spinlocks allow a pvops backend to replace the
          spinlock implementation with something virtualization-friendly
@@ -656,6 +657,15 @@ config KVM_GUEST
          underlying device model, the host provides the guest with
          timing infrastructure such as time of day, and system time
 
+config KVM_DEBUG_FS
+       bool "Enable debug information for KVM Guests in debugfs"
+       depends on KVM_GUEST && DEBUG_FS
+       default n
+       ---help---
+         This option enables collection of various statistics for KVM guest.
+         Statistics are displayed in debugfs filesystem. Enabling this option
+         may incur significant overhead.
+
 source "arch/x86/lguest/Kconfig"
 
 config PARAVIRT_TIME_ACCOUNTING
@@ -1344,8 +1354,12 @@ config ARCH_SELECT_MEMORY_MODEL
        depends on ARCH_SPARSEMEM_ENABLE
 
 config ARCH_MEMORY_PROBE
-       def_bool y
+       bool "Enable sysfs memory/probe interface"
        depends on X86_64 && MEMORY_HOTPLUG
+       help
+         This option enables a sysfs memory/probe interface for testing.
+         See Documentation/memory-hotplug.txt for more information.
+         If you are unsure how to answer this question, answer N.
 
 config ARCH_PROC_KCORE_TEXT
        def_bool y
@@ -2018,7 +2032,6 @@ menu "Bus options (PCI etc.)"
 config PCI
        bool "PCI support"
        default y
-       select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
        ---help---
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside