summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 18:58:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-02 18:58:56 -0700
commit041924ec2f40efa6a3163144a5481a000804199d (patch)
tree8d6d8cb6022dfff00fefb85341e19343c4396f7c /arch
parentf36b7a2c170ff1dbbb38d235817e04020b196950 (diff)
parentefac41894df57d32b483ac622d03541b5b2692c0 (diff)
downloadlinux-041924ec2f40efa6a3163144a5481a000804199d.tar.bz2
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix NODES_SHIFT Kconfig range
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e0edaaa6920a..bf07b6f50fa1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -966,8 +966,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"