diff options
| author | Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-04-11 01:53:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 09:18:39 -0400 |
| commit | c80d79d746cc48bd94b0ce4f6d4f3c90cd403aaf (patch) | |
| tree | 5aa8d1590d95f8fd820ad797fe03a063b592e9bf /include/asm-ia64 | |
| parent | 653edba1a8b2ed018bdfb078131324dfbfe1dd6a (diff) | |
[PATCH] Configurable NODES_SHIFT
Current implementations define NODES_SHIFT in include/asm-xxx/numnodes.h for
each arch. Its definition is sometimes configurable. Indeed, ia64 defines 5
NODES_SHIFT values in the current git tree. But it looks a bit messy.
SGI-SN2(ia64) system requires 1024 nodes, and the number of nodes already has
been changeable by config. Suitable node's number may be changed in the
future even if it is other architecture. So, I wrote configurable node's
number.
This patch set defines just default value for each arch which needs multi
nodes except ia64. But, it is easy to change to configurable if necessary.
On ia64 the number of nodes can be already configured in generic ia64 and SN2
config. But, NODES_SHIFT is defined for DIG64 and HP'S machine too. So, I
changed it so that all platforms can be configured via CONFIG_NODES_SHIFT. It
would be simpler.
See also: http://marc.theaimsgroup.com/?l=linux-kernel&m=114358010523896&w=2
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/numnodes.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/asm-ia64/numnodes.h b/include/asm-ia64/numnodes.h deleted file mode 100644 index e9d356f549d9..000000000000 --- a/include/asm-ia64/numnodes.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | #ifndef _ASM_MAX_NUMNODES_H | ||
| 2 | #define _ASM_MAX_NUMNODES_H | ||
| 3 | |||
| 4 | #ifdef CONFIG_IA64_DIG | ||
| 5 | /* Max 8 Nodes */ | ||
| 6 | # define NODES_SHIFT 3 | ||
| 7 | #elif defined(CONFIG_IA64_HP_ZX1) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB) | ||
| 8 | /* Max 32 Nodes */ | ||
| 9 | # define NODES_SHIFT 5 | ||
| 10 | #elif defined(CONFIG_IA64_SGI_SN2) || defined(CONFIG_IA64_GENERIC) | ||
| 11 | # if CONFIG_IA64_NR_NODES == 256 | ||
| 12 | # define NODES_SHIFT 8 | ||
| 13 | # elif CONFIG_IA64_NR_NODES <= 512 | ||
| 14 | # define NODES_SHIFT 9 | ||
| 15 | # elif CONFIG_IA64_NR_NODES <= 1024 | ||
| 16 | # define NODES_SHIFT 10 | ||
| 17 | # endif | ||
| 18 | #endif | ||
| 19 | |||
| 20 | #endif /* _ASM_MAX_NUMNODES_H */ | ||