1 files changed, 15 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c9086e6307a5..a6efe0a2e9ae 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -277,6 +277,7 @@ config SPARSE_IRQ
 config NUMA_MIGRATE_IRQ_DESC
         bool "Move irq desc when changing irq smp_affinity"
         depends on SPARSE_IRQ && NUMA
+        depends on BROKEN
         default n
         ---help---
           This enables moving irq_desc to cpu/node that irq will use handled.
@@ -497,6 +498,19 @@ config PARAVIRT
           over full virtualization.  However, when run without a hypervisor
           the kernel is theoretically slower and slightly larger.
 
+config PARAVIRT_SPINLOCKS
+        bool "Paravirtualization layer for spinlocks"
+        depends on PARAVIRT && SMP && EXPERIMENTAL
+        ---help---
+          Paravirtualized spinlocks allow a pvops backend to replace the
+          spinlock implementation with something virtualization-friendly
+          (for example, block the virtual CPU rather than spinning).
+
+          Unfortunately the downside is an up to 5% performance hit on
+          native kernels, with various workloads.
+
+          If you are unsure how to answer this question, answer N.
+
 config PARAVIRT_CLOCK
         bool
         default n
@@ -664,6 +678,7 @@ config MAXSMP
 
 config NR_CPUS
         int "Maximum number of CPUs" if SMP && !MAXSMP
+        range 2 8 if SMP && X86_32 && !X86_BIGSMP
         range 2 512 if SMP && !MAXSMP
         default "1" if !SMP
         default "4096" if MAXSMP