Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f06a96844a577c43249fce25809a4fae07407f46

Authored by Christoph Lameter
Committed by Linus Torvalds
1 parent 776ed98b84

[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>

Showing 11 changed files with 12 additions and 12 deletions Side-by-side Diff

arch/alpha/mm/init.c
Diff comments   View file @ f06a968
... ... @@ -270,7 +270,7 @@
270 270 void
271 271 paging_init(void)
272 272 {
273   - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
  273 + unsigned long zones_size[MAX_NR_ZONES] = {0, };
274 274 unsigned long dma_pfn, high_pfn;
275 275  
276 276 dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
... ... @@ -98,7 +98,7 @@
98 98 */
99 99 void __init paging_init(void)
100 100 {
101   - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
  101 + unsigned long zones_size[MAX_NR_ZONES] = {0, };
102 102  
103 103 /* allocate some pages for kernel housekeeping tasks */
104 104 empty_bad_page_table = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
arch/h8300/mm/init.c
Diff comments   View file @ f06a968
... ... @@ -138,7 +138,7 @@
138 138 #endif
139 139  
140 140 {
141   - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
  141 + unsigned long zones_size[MAX_NR_ZONES] = {0, };
142 142  
143 143 zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
144 144 zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
arch/i386/kernel/setup.c
Diff comments   View file @ f06a968
... ... @@ -1182,7 +1182,7 @@
1182 1182  
1183 1183 void __init zone_sizes_init(void)
1184 1184 {
1185   - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
  1185 + unsigned long zones_size[MAX_NR_ZONES] = { 0, };
1186 1186 unsigned int max_dma, low;
1187 1187  
1188 1188 max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
arch/i386/mm/discontig.c
Diff comments   View file @ f06a968
... ... @@ -367,7 +367,7 @@
367 367  
368 368  
369 369 for_each_online_node(nid) {
370   - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
  370 + unsigned long zones_size[MAX_NR_ZONES] = {0, };
371 371 unsigned long *zholes_size;
372 372 unsigned int max_dma;
373 373  
... ... @@ -100,7 +100,7 @@
100 100 #ifndef CONFIG_DISCONTIGMEM
101 101 unsigned long __init zone_sizes_init(void)
102 102 {
103   - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
  103 + unsigned long zones_size[MAX_NR_ZONES] = {0, };
104 104 unsigned long max_dma;
105 105 unsigned long low;
106 106 unsigned long start_pfn;
arch/m68knommu/mm/init.c
Diff comments   View file @ f06a968
... ... @@ -136,7 +136,7 @@
136 136 #endif
137 137  
138 138 {
139   - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
  139 + unsigned long zones_size[MAX_NR_ZONES] = {0, };
140 140  
141 141 zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
142 142 zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
... ... @@ -163,10 +163,10 @@
163 163  
164 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 167 unsigned long max_dma, high, low;
168 168 #ifndef CONFIG_FLATMEM
169   - unsigned long zholes_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 };
  169 + unsigned long zholes_size[] = { 0, };
170 170 unsigned long i, j, pfn;
171 171 #endif
172 172  
arch/mips/sgi-ip27/ip27-memory.c
Diff comments   View file @ f06a968
... ... @@ -508,7 +508,7 @@
508 508  
509 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 512 unsigned node;
513 513  
514 514 pagetable_init();
arch/parisc/mm/init.c
Diff comments   View file @ f06a968
... ... @@ -809,7 +809,7 @@
809 809 flush_tlb_all_local(NULL);
810 810  
811 811 for (i = 0; i < npmem_ranges; i++) {
812   - unsigned long zones_size[MAX_NR_ZONES] = { 0, 0, 0 };
  812 + unsigned long zones_size[MAX_NR_ZONES] = { 0, };
813 813  
814 814 /* We have an IOMMU, so all memory can go into a single
815 815 ZONE_DMA zone. */
... ... @@ -110,7 +110,7 @@
110 110 */
111 111 void __init paging_init(void)
112 112 {
113   - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
  113 + unsigned long zones_size[MAX_NR_ZONES] = {0, };
114 114  
115 115 pgd_init((unsigned long)swapper_pg_dir);
116 116 pgd_init((unsigned long)swapper_pg_dir +