From f8225bfcdaadd9eb8f311a02a0d7f03e5c8cd97b Mon Sep 17 00:00:00 2001 From: Mike Travis Date: Fri, 16 May 2008 10:44:39 -0700 Subject: [PATCH] --- yaml --- r: 99471 b: refs/heads/master c: c3ed64295f0fed9131b42122234b1ce4a4a266cf h: refs/heads/master i: 99469: 220297b3d6c49a40693232fb712608031c4be46a 99467: 7818c926bf7790bcab1ccf1b8a253f51a7d74a78 99463: 2d8a610d949f5155e14976a92420344bb5666ddf 99455: 5ab95b0eed59027ab6813d37c59b519c9b6da061 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5d8402861d7e..dd71982248b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8096f92b87d81c55ed63964d27baa9ce5ffe508 +refs/heads/master: c3ed64295f0fed9131b42122234b1ce4a4a266cf diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index fe361ae7ef2f..bbafeac89116 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -565,18 +565,18 @@ config IOMMU_HELPER def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) config NR_CPUS - int "Maximum number of CPUs (2-255)" - range 2 255 + int "Maximum number of CPUs (2-4096)" + range 2 4096 depends on SMP default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 default "8" help This allows you to specify the maximum number of CPUs which this - kernel will support. The maximum supported value is 255 and the + kernel will support. The maximum supported value is 4096 and the minimum value which makes sense is 2. This is purely to save memory - each supported CPU adds - approximately eight kilobytes to the kernel image. + approximately one kilobyte to the kernel image. config SCHED_SMT bool "SMT (Hyperthreading) scheduler support" @@ -968,8 +968,8 @@ config NUMA_EMU number of nodes. This is only useful for debugging. config NODES_SHIFT - int "Max num nodes shift(1-15)" - range 1 15 if X86_64 + int "Max num nodes shift(1-9)" + range 1 9 if X86_64 default "6" if X86_64 default "4" if X86_NUMAQ default "3"