diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 21:58:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 21:58:56 -0400 |
| commit | 041924ec2f40efa6a3163144a5481a000804199d (patch) | |
| tree | 8d6d8cb6022dfff00fefb85341e19343c4396f7c /arch | |
| parent | f36b7a2c170ff1dbbb38d235817e04020b196950 (diff) | |
| parent | efac41894df57d32b483ac622d03541b5b2692c0 (diff) | |
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/Kconfig | 4 |
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 | |||
| 966 | number of nodes. This is only useful for debugging. | 966 | number of nodes. This is only useful for debugging. |
| 967 | 967 | ||
| 968 | config NODES_SHIFT | 968 | config NODES_SHIFT |
| 969 | int "Max num nodes shift(1-15)" | 969 | int "Max num nodes shift(1-9)" |
| 970 | range 1 15 if X86_64 | 970 | range 1 9 if X86_64 |
| 971 | default "6" if X86_64 | 971 | default "6" if X86_64 |
| 972 | default "4" if X86_NUMAQ | 972 | default "4" if X86_NUMAQ |
| 973 | default "3" | 973 | default "3" |