1 files changed, 3 insertions, 7 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 58fb7b3bcd1a..e03485b2828a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -274,14 +274,9 @@ config SPARSE_IRQ
 
           If you don't know what to do here, say N.
 
-config NUMA_MIGRATE_IRQ_DESC
-        bool "Move irq desc when changing irq smp_affinity"
+config NUMA_IRQ_DESC
+        def_bool y
         depends on SPARSE_IRQ && NUMA
-        default n
-        ---help---
-          This enables moving irq_desc to cpu/node that irq will use handled.
-
-          If you don't know what to do here, say N.
 
 config X86_MPPARSE
         bool "Enable MPS table" if ACPI
@@ -664,6 +659,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