From: Christoph Lameter 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 Signed-off-by: Andrew Morton --- arch/alpha/mm/init.c | 2 +- arch/frv/mm/init.c | 2 +- arch/h8300/mm/init.c | 2 +- arch/i386/kernel/setup.c | 2 +- arch/i386/mm/discontig.c | 2 +- arch/m32r/mm/init.c | 2 +- arch/m68knommu/mm/init.c | 2 +- arch/mips/mm/init.c | 4 ++-- arch/mips/sgi-ip27/ip27-memory.c | 2 +- arch/parisc/mm/init.c | 2 +- arch/sh64/mm/init.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff -puN arch/alpha/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/alpha/mm/init.c --- a/arch/alpha/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/alpha/mm/init.c @@ -270,7 +270,7 @@ callback_init(void * kernel_end) void paging_init(void) { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, }; unsigned long dma_pfn, high_pfn; dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; diff -puN arch/frv/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/frv/mm/init.c --- a/arch/frv/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/frv/mm/init.c @@ -98,7 +98,7 @@ void show_mem(void) */ void __init paging_init(void) { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, }; /* allocate some pages for kernel housekeeping tasks */ empty_bad_page_table = (unsigned long) alloc_bootmem_pages(PAGE_SIZE); diff -puN arch/h8300/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/h8300/mm/init.c --- a/arch/h8300/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/h8300/mm/init.c @@ -138,7 +138,7 @@ void paging_init(void) #endif { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, }; zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT; zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT; diff -puN arch/i386/kernel/setup.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/i386/kernel/setup.c @@ -1071,7 +1071,7 @@ static unsigned long __init setup_memory void __init zone_sizes_init(void) { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = { 0, }; unsigned int max_dma, low; max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; diff -puN arch/i386/mm/discontig.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/i386/mm/discontig.c --- a/arch/i386/mm/discontig.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/i386/mm/discontig.c @@ -372,7 +372,7 @@ void __init zone_sizes_init(void) for_each_online_node(nid) { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, }; unsigned long *zholes_size; unsigned int max_dma; diff -puN arch/m32r/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/m32r/mm/init.c --- a/arch/m32r/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/m32r/mm/init.c @@ -100,7 +100,7 @@ void free_initrd_mem(unsigned long, unsi #ifndef CONFIG_DISCONTIGMEM unsigned long __init zone_sizes_init(void) { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, }; unsigned long max_dma; unsigned long low; unsigned long start_pfn; diff -puN arch/m68knommu/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/m68knommu/mm/init.c --- a/arch/m68knommu/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/m68knommu/mm/init.c @@ -136,7 +136,7 @@ void paging_init(void) #endif { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, }; zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT; zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT; diff -puN arch/mips/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/mips/mm/init.c --- a/arch/mips/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/mips/mm/init.c @@ -163,10 +163,10 @@ static int __init page_is_ram(unsigned l void __init paging_init(void) { - unsigned long zones_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 }; + unsigned long zones_size[] = { 0, }; unsigned long max_dma, high, low; #ifndef CONFIG_FLATMEM - unsigned long zholes_size[] = { [0 ... MAX_NR_ZONES - 1] = 0 }; + unsigned long zholes_size[] = { 0, }; unsigned long i, j, pfn; #endif diff -puN arch/mips/sgi-ip27/ip27-memory.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/mips/sgi-ip27/ip27-memory.c --- a/arch/mips/sgi-ip27/ip27-memory.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/mips/sgi-ip27/ip27-memory.c @@ -508,7 +508,7 @@ extern unsigned long setup_zero_pages(vo void __init paging_init(void) { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, }; unsigned node; pagetable_init(); diff -puN arch/parisc/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/parisc/mm/init.c --- a/arch/parisc/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/parisc/mm/init.c @@ -806,7 +806,7 @@ void __init paging_init(void) flush_tlb_all_local(NULL); for (i = 0; i < npmem_ranges; i++) { - unsigned long zones_size[MAX_NR_ZONES] = { 0, 0, 0 }; + unsigned long zones_size[MAX_NR_ZONES] = { 0, }; /* We have an IOMMU, so all memory can go into a single ZONE_DMA zone. */ diff -puN arch/sh64/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/sh64/mm/init.c --- a/arch/sh64/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations +++ a/arch/sh64/mm/init.c @@ -110,7 +110,7 @@ void show_mem(void) */ void __init paging_init(void) { - unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0}; + unsigned long zones_size[MAX_NR_ZONES] = {0, }; pgd_init((unsigned long)swapper_pg_dir); pgd_init((unsigned long)swapper_pg_dir + _