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

Commit 7590abe8 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

memblock: Move memblock_init() to the bottom of the file 



It's a real PITA to have to search for it in the middle

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 4d629f9a

mm/memblock.c

+27 −27
Original line number Original line Diff line number Diff line
@@ -107,33 +107,6 @@ static void memblock_coalesce_regions(struct memblock_type *type, 
	memblock_remove_region(type, r2);

	memblock_remove_region(type, r2);

}

}





void __init memblock_init(void)

{

	/* Hookup the initial arrays */

	memblock.memory.regions	= memblock_memory_init_regions;

	memblock.memory.max		= INIT_MEMBLOCK_REGIONS;

	memblock.reserved.regions	= memblock_reserved_init_regions;

	memblock.reserved.max	= INIT_MEMBLOCK_REGIONS;



	/* Write a marker in the unused last array entry */

	memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;

	memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;



	/* Create a dummy zero size MEMBLOCK which will get coalesced away later.

	 * This simplifies the memblock_add() code below...

	 */

	memblock.memory.regions[0].base = 0;

	memblock.memory.regions[0].size = 0;

	memblock.memory.cnt = 1;



	/* Ditto. */

	memblock.reserved.regions[0].base = 0;

	memblock.reserved.regions[0].size = 0;

	memblock.reserved.cnt = 1;



	memblock.current_limit = MEMBLOCK_ALLOC_ANYWHERE;

}



void __init memblock_analyze(void)

void __init memblock_analyze(void)

{

{

	int i;

	int i;
@@ -543,3 +516,30 @@ void __init memblock_set_current_limit(phys_addr_t limit) 
	memblock.current_limit = limit;

	memblock.current_limit = limit;

}

}





void __init memblock_init(void)

{

	/* Hookup the initial arrays */

	memblock.memory.regions	= memblock_memory_init_regions;

	memblock.memory.max		= INIT_MEMBLOCK_REGIONS;

	memblock.reserved.regions	= memblock_reserved_init_regions;

	memblock.reserved.max	= INIT_MEMBLOCK_REGIONS;



	/* Write a marker in the unused last array entry */

	memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;

	memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;



	/* Create a dummy zero size MEMBLOCK which will get coalesced away later.

	 * This simplifies the memblock_add() code below...

	 */

	memblock.memory.regions[0].base = 0;

	memblock.memory.regions[0].size = 0;

	memblock.memory.cnt = 1;



	/* Ditto. */

	memblock.reserved.regions[0].base = 0;

	memblock.reserved.regions[0].size = 0;

	memblock.reserved.cnt = 1;



	memblock.current_limit = MEMBLOCK_ALLOC_ANYWHERE;

}