diff options
author | David S. Miller <davem@davemloft.net> | 2017-06-10 14:06:46 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-10 14:06:46 -0700 |
commit | 95c4629d92d15d10e5f7c55bfb72583f96a91374 (patch) | |
tree | ef9b973bfbf9f85659f4fc2794d8271bd19c4857 /arch/sparc/Kconfig | |
parent | 60925ee97e2be4993fb7a2f7e70be0fbce08cf0f (diff) | |
parent | 5faab9e0f03c4eef97886b45436015e107f79f5f (diff) | |
download | op-kernel-dev-95c4629d92d15d10e5f7c55bfb72583f96a91374.zip op-kernel-dev-95c4629d92d15d10e5f7c55bfb72583f96a91374.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r-- | arch/sparc/Kconfig | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 78af684..6d77696 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -197,9 +197,9 @@ config NR_CPUS int "Maximum number of CPUs" depends on SMP range 2 32 if SPARC32 - range 2 1024 if SPARC64 + range 2 4096 if SPARC64 default 32 if SPARC32 - default 64 if SPARC64 + default 4096 if SPARC64 source kernel/Kconfig.hz @@ -300,9 +300,13 @@ config NUMA depends on SPARC64 && SMP config NODES_SHIFT - int - default "4" + int "Maximum NUMA Nodes (as a power of 2)" + range 4 5 if SPARC64 + default "5" depends on NEED_MULTIPLE_NODES + help + Specify the maximum number of NUMA Nodes available on the target + system. Increases memory reserved to accommodate various tables. # Some NUMA nodes have memory ranges that span # other nodes. Even though a pfn is valid and |