Commit 041924ec authored Jul 02, 2008 by 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

arch/x86/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -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"

Admin message