Skip to content

Commit

Permalink
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…
Browse files Browse the repository at this point in the history
…nux/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
  • Loading branch information
Linus Torvalds committed Jul 3, 2008
2 parents f36b7a2 + efac418 commit 041924e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 041924e

Please sign in to comment.