1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bc25b9f5e4cd..df9e885eee14 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.
@@ -353,6 +354,7 @@ config X86_UV
         bool "SGI Ultraviolet"
         depends on X86_64
         depends on X86_EXTENDED_PLATFORM
+        depends on NUMA
         select X86_X2APIC
         ---help---
           This option is needed in order to support SGI Ultraviolet systems.
@@ -663,6 +665,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