diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-09-26 02:31:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:46 -0400 |
commit | f06a96844a577c43249fce25809a4fae07407f46 (patch) | |
tree | 57fd0fdbfbcce081d27d5595de2886b748b8bb49 /arch/mips | |
parent | 776ed98b842ee8551793f842fe028c8091f3633e (diff) |
[PATCH] reduce MAX_NR_ZONES: fix MAX_NR_ZONES array initializations
Fix array initialization in lots of arches
The number of zones may now be reduced from 4 to 2 for many arches. Fix the
array initialization for the zones array for all architectures so that it is
not initializing a fixed number of elements.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/mm/init.c | 4 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/ip27-memory.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index c52497bb102..5b06349af2d 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -163,10 +163,10 @@ static int __init page_is_ram(unsigned long pagenr) | |||
163 | 163 | ||
164 | void __init paging_init(void) | 164 | void __init paging_init(void) |
165 | { | 165 | { |
166 | unsigned long zones_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 }; | 166 | unsigned long zones_size[] = { 0, }; |
167 | unsigned long max_dma, high, low; | 167 | unsigned long max_dma, high, low; |
168 | #ifndef CONFIG_FLATMEM | 168 | #ifndef CONFIG_FLATMEM |
169 | unsigned long zholes_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 }; | 169 | unsigned long zholes_size[] = { 0, }; |
170 | unsigned long i, j, pfn; | 170 | unsigned long i, j, pfn; |
171 | #endif | 171 | #endif |
172 | 172 | ||
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index efe6971fc80..59bfc0fc3f4 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
@@ -508,7 +508,7 @@ extern unsigned long setup_zero_pages(void); | |||
508 | 508 | ||
509 | void __init paging_init(void) | 509 | void __init paging_init(void) |
510 | { | 510 | { |
511 | unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; | 511 | unsigned long zones_size[MAX_NR_ZONES] = {0, }; |
512 | unsigned node; | 512 | unsigned node; |
513 | 513 | ||
514 | pagetable_init(); | 514 | pagetable_init(); |