diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:26:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:26:52 -0400 |
commit | 4fe8a0f4c5d64cbc78227a88df4566c0d0ee4648 (patch) | |
tree | 9dc3fc8276d987058cd8f3826113c5baa2a1b595 /arch/ia64/sn/kernel/setup.c | |
parent | 529980c8b0b04e8a3f6606cdc156f1f81a5d68cd (diff) | |
parent | 344a076110f4ecb16ea6d286b63be696604982ed (diff) |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/sn/kernel/setup.c')
-rw-r--r-- | arch/ia64/sn/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index a594aca959e6..14908ad7db8c 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
@@ -56,7 +56,7 @@ | |||
56 | 56 | ||
57 | DEFINE_PER_CPU(struct pda_s, pda_percpu); | 57 | DEFINE_PER_CPU(struct pda_s, pda_percpu); |
58 | 58 | ||
59 | #define MAX_PHYS_MEMORY (1UL << 49) /* 1 TB */ | 59 | #define MAX_PHYS_MEMORY (1UL << IA64_MAX_PHYS_BITS) /* Max physical address supported */ |
60 | 60 | ||
61 | lboard_t *root_lboard[MAX_COMPACT_NODES]; | 61 | lboard_t *root_lboard[MAX_COMPACT_NODES]; |
62 | 62 | ||