diff options
author | Mike Travis <travis@sgi.com> | 2008-12-16 20:33:51 -0500 |
---|---|---|
committer | Mike Travis <travis@sgi.com> | 2008-12-16 20:40:55 -0500 |
commit | 36f5101a60de8f79c0d1ca06e50660bf5129e02c (patch) | |
tree | 5476f291ff57f1e5873e207cd70134f67911573b /arch/x86 | |
parent | c8cae544bba6aee0f5cb0756dbab1a71d2c68737 (diff) |
x86: enable MAXSMP
Impact: activates new off-stack cpumask code on MAXSMP (non-default) x86 configs
Set MAXSMP to enable CONFIG_CPUMASK_OFFSTACK which moves cpumask's off
the stack (and in structs) when using cpumask_var_t.
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Ingo Molnar <mingo@elte.hy>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d99eeb7915c6..1fd44352f27c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -591,16 +591,17 @@ config IOMMU_HELPER | |||
591 | 591 | ||
592 | config MAXSMP | 592 | config MAXSMP |
593 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" | 593 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" |
594 | depends on X86_64 && SMP && BROKEN | 594 | depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL |
595 | select CPUMASK_OFFSTACK | ||
595 | default n | 596 | default n |
596 | help | 597 | help |
597 | Configure maximum number of CPUS and NUMA Nodes for this architecture. | 598 | Configure maximum number of CPUS and NUMA Nodes for this architecture. |
598 | If unsure, say N. | 599 | If unsure, say N. |
599 | 600 | ||
600 | config NR_CPUS | 601 | config NR_CPUS |
601 | int "Maximum number of CPUs (2-512)" if !MAXSMP | ||
602 | range 2 512 | ||
603 | depends on SMP | 602 | depends on SMP |
603 | int "Maximum number of CPUs" if SMP && !MAXSMP | ||
604 | range 2 512 if SMP && !MAXSMP | ||
604 | default "4096" if MAXSMP | 605 | default "4096" if MAXSMP |
605 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 606 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
606 | default "8" | 607 | default "8" |