Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f06a9684 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[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: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 776ed98b

arch/alpha/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/frv/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/h8300/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/i386/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1182,7 +1182,7 @@ static unsigned long __init setup_memory(void) 


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;

arch/i386/mm/discontig.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,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;