diff options
| author | Jack Steiner <steiner@sgi.com> | 2006-03-02 16:02:21 -0600 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-03-24 13:14:03 -0800 |
| commit | b354a8388891adc5dc5e5fb0130f000152f3fb94 (patch) | |
| tree | 17ddef0b367ed0279f8f10d5d9af73ecd01e3db9 | |
| parent | f90aa8c4febb306e1266e1ad34fd8464e201aa7f (diff) | |
| download | linux-b354a8388891adc5dc5e5fb0130f000152f3fb94.tar.gz | |
[IA64] Increase max node count on SN platforms
Add a configuration option to allow the maximum
number of nodes to be configurable for GENERIC or SN
kernels.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/Kconfig | 9 | ||||
| -rw-r--r-- | include/asm-ia64/numnodes.h | 13 |
2 files changed, 18 insertions, 4 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index ff7ae6b664e8a..10b6b9e7716ba 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -252,6 +252,15 @@ config NR_CPUS than 64 will cause the use of a CPU mask array, causing a small performance hit. +config IA64_NR_NODES + int "Maximum number of NODEs (256-1024)" if (IA64_SGI_SN2 || IA64_GENERIC) + range 256 1024 + depends on IA64_SGI_SN2 || IA64_GENERIC + default "256" + help + This option specifies the maximum number of nodes in your SSI system. + If in doubt, use the default. + config HOTPLUG_CPU bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" depends on SMP && EXPERIMENTAL diff --git a/include/asm-ia64/numnodes.h b/include/asm-ia64/numnodes.h index 21cff4da54854..e9d356f549d90 100644 --- a/include/asm-ia64/numnodes.h +++ b/include/asm-ia64/numnodes.h @@ -3,13 +3,18 @@ #ifdef CONFIG_IA64_DIG /* Max 8 Nodes */ -#define NODES_SHIFT 3 +# define NODES_SHIFT 3 #elif defined(CONFIG_IA64_HP_ZX1) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB) /* Max 32 Nodes */ -#define NODES_SHIFT 5 +# define NODES_SHIFT 5 #elif defined(CONFIG_IA64_SGI_SN2) || defined(CONFIG_IA64_GENERIC) -/* Max 256 Nodes */ -#define NODES_SHIFT 8 +# if CONFIG_IA64_NR_NODES == 256 +# define NODES_SHIFT 8 +# elif CONFIG_IA64_NR_NODES <= 512 +# define NODES_SHIFT 9 +# elif CONFIG_IA64_NR_NODES <= 1024 +# define NODES_SHIFT 10 +# endif #endif #endif /* _ASM_MAX_NUMNODES_H */ |