sparc64: nr_cpus and nodes_shift

This is being done for M5 and the like.

To go beyond the NR_CPUS limit of 4064, the issue in cpu mondo -
init_cpu_send_mondo_info - needs to be addressed and appears possible.

Orabug: 23128525

Signed-off-by: Bob Picco <bob.picco@oracle.com>
Signed-off-by: Allen Pais <allen.pais@oracle.com>
(cherry picked from commit d8ce9cc00181bfa65865c6d1624f0dcb3d048a7b)
(cherry picked from commit ce753fe5d10682939912242c9880935472f1e195)

Conflicts:
	arch/sparc/Kconfig

Signed-off-by: Allen Pais <allen.pais@oracle.com>
(cherry picked from commit 48df0cc664ddfb2f03dc1afbb3ff01a3192c9723)
(cherry picked from commit fdb632ef6a250d24887003cc35b72744183c8642)

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 2d9ec7c6d54b17b11fa654ba69fc53d06cd4d603..869df9cc166db3b736aca456484d3518c49a5467 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -190,7 +190,7 @@ config NR_CPUS
        int "Maximum number of CPUs"
        depends on SMP
        range 2 32 if SPARC32
-       range 2 2048 if SPARC64
+       range 2 4064 if SPARC64
        default 32 if SPARC32
        default 2048 if SPARC64
 
@@ -328,7 +328,8 @@ config NUMA
        depends on SPARC64 && SMP
 
 config NODES_SHIFT
-       int
+       int "Nodes Shift"
+       range 4 5 if SPARC64
        default "4"
        depends on NEED_MULTIPLE_NODES