diff options
| author | Ingo Molnar | 2008-07-08 11:59:23 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-08 11:59:23 +0200 |
| commit | 2b4fa851b2f06fdb04cac808b57324f5e51e1578 (patch) | |
| tree | 97db3ad5adda7683923630982f68b8b52c86e790 /arch/x86/Kconfig | |
| parent | Merge branch 'x86/mpparse' into x86/devel (diff) | |
| parent | x86: use reserve_bootmem_generic() to reserve crashkernel memory on x86_64 (diff) | |
| download | kernel-qcow2-linux-2b4fa851b2f06fdb04cac808b57324f5e51e1578.tar.gz kernel-qcow2-linux-2b4fa851b2f06fdb04cac808b57324f5e51e1578.tar.xz kernel-qcow2-linux-2b4fa851b2f06fdb04cac808b57324f5e51e1578.zip | |
Merge branch 'x86/numa' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/e820.c
arch/x86/kernel/efi_64.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup.c
arch/x86/kernel/setup_32.c
arch/x86/mm/init_64.c
include/asm-x86/proto.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 640dc62a7fa0..112afd368c77 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -121,7 +121,7 @@ config ARCH_HAS_CACHE_LINE_SIZE def_bool y config HAVE_SETUP_PER_CPU_AREA - def_bool X86_64 || (X86_SMP && !X86_VOYAGER) + def_bool X86_64_SMP || (X86_SMP && !X86_VOYAGER) config HAVE_CPUMASK_OF_CPU_MAP def_bool X86_64_SMP @@ -579,7 +579,21 @@ config SWIOTLB config IOMMU_HELPER def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) +config MAXSMP + bool "Configure Maximum number of SMP Processors and NUMA Nodes" + depends on X86_64 && SMP + default n + help + Configure maximum number of CPUS and NUMA Nodes for this architecture. + If unsure, say N. +if MAXSMP +config NR_CPUS + int + default "4096" +endif + +if !MAXSMP config NR_CPUS int "Maximum number of CPUs (2-4096)" range 2 4096 @@ -592,7 +606,8 @@ config NR_CPUS minimum value which makes sense is 2. This is purely to save memory - each supported CPU adds - approximately one kilobyte to the kernel image. + approximately eight kilobytes to the kernel image. +endif config SCHED_SMT bool "SMT (Hyperthreading) scheduler support" @@ -983,13 +998,25 @@ config NUMA_EMU into virtual nodes when booted with "numa=fake=N", where N is the number of nodes. This is only useful for debugging. +if MAXSMP + +config NODES_SHIFT + int + default "9" +endif + +if !MAXSMP config NODES_SHIFT - int "Max num nodes shift(1-9)" - range 1 9 if X86_64 + int "Maximum NUMA Nodes (as a power of 2)" + range 1 9 if X86_64 default "6" if X86_64 default "4" if X86_NUMAQ default "3" depends on NEED_MULTIPLE_NODES + help + Specify the maximum number of NUMA Nodes available on the target + system. Increases memory reserved to accomodate various tables. +endif config HAVE_ARCH_BOOTMEM_NODE def_bool y |