aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/Kconfig30
1 files changed, 8 insertions, 22 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 68d91c8233f4..ed92864d1325 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -577,35 +577,29 @@ config SWIOTLB
577 577
578config IOMMU_HELPER 578config IOMMU_HELPER
579 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) 579 def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
580
580config MAXSMP 581config MAXSMP
581 bool "Configure Maximum number of SMP Processors and NUMA Nodes" 582 bool "Configure Maximum number of SMP Processors and NUMA Nodes"
582 depends on X86_64 && SMP 583 depends on X86_64 && SMP && BROKEN
583 default n 584 default n
584 help 585 help
585 Configure maximum number of CPUS and NUMA Nodes for this architecture. 586 Configure maximum number of CPUS and NUMA Nodes for this architecture.
586 If unsure, say N. 587 If unsure, say N.
587 588
588if MAXSMP
589config NR_CPUS
590 int
591 default "4096"
592endif
593
594if !MAXSMP
595config NR_CPUS 589config NR_CPUS
596 int "Maximum number of CPUs (2-4096)" 590 int "Maximum number of CPUs (2-512)" if !MAXSMP
597 range 2 4096 591 range 2 512
598 depends on SMP 592 depends on SMP
593 default "4096" if MAXSMP
599 default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 594 default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
600 default "8" 595 default "8"
601 help 596 help
602 This allows you to specify the maximum number of CPUs which this 597 This allows you to specify the maximum number of CPUs which this
603 kernel will support. The maximum supported value is 4096 and the 598 kernel will support. The maximum supported value is 512 and the
604 minimum value which makes sense is 2. 599 minimum value which makes sense is 2.
605 600
606 This is purely to save memory - each supported CPU adds 601 This is purely to save memory - each supported CPU adds
607 approximately eight kilobytes to the kernel image. 602 approximately eight kilobytes to the kernel image.
608endif
609 603
610config SCHED_SMT 604config SCHED_SMT
611 bool "SMT (Hyperthreading) scheduler support" 605 bool "SMT (Hyperthreading) scheduler support"
@@ -996,17 +990,10 @@ config NUMA_EMU
996 into virtual nodes when booted with "numa=fake=N", where N is the 990 into virtual nodes when booted with "numa=fake=N", where N is the
997 number of nodes. This is only useful for debugging. 991 number of nodes. This is only useful for debugging.
998 992
999if MAXSMP
1000
1001config NODES_SHIFT 993config NODES_SHIFT
1002 int 994 int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP
1003 default "9"
1004endif
1005
1006if !MAXSMP
1007config NODES_SHIFT
1008 int "Maximum NUMA Nodes (as a power of 2)"
1009 range 1 9 if X86_64 995 range 1 9 if X86_64
996 default "9" if MAXSMP
1010 default "6" if X86_64 997 default "6" if X86_64
1011 default "4" if X86_NUMAQ 998 default "4" if X86_NUMAQ
1012 default "3" 999 default "3"
@@ -1014,7 +1001,6 @@ config NODES_SHIFT
1014 help 1001 help
1015 Specify the maximum number of NUMA Nodes available on the target 1002 Specify the maximum number of NUMA Nodes available on the target
1016 system. Increases memory reserved to accomodate various tables. 1003 system. Increases memory reserved to accomodate various tables.
1017endif
1018 1004
1019config HAVE_ARCH_BOOTMEM_NODE 1005config HAVE_ARCH_BOOTMEM_NODE
1020 def_bool y 1006 def_bool y