Commit 041924ec authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-fixes-for-linus' of...

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
parents f36b7a2c efac4189
...@@ -966,8 +966,8 @@ config NUMA_EMU ...@@ -966,8 +966,8 @@ config NUMA_EMU
number of nodes. This is only useful for debugging. number of nodes. This is only useful for debugging.
config NODES_SHIFT config NODES_SHIFT
int "Max num nodes shift(1-15)" int "Max num nodes shift(1-9)"
range 1 15 if X86_64 range 1 9 if X86_64
default "6" if X86_64 default "6" if X86_64
default "4" if X86_NUMAQ default "4" if X86_NUMAQ
default "3" default "3"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment