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

Commit 719c1514 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

memblock/arm: Use new accessors 



CC: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 28be7072

arch/arm/mm/init.c

+12 −9
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ static void __init find_limits(struct meminfo *mi, 
static void __init arm_bootmem_init(struct meminfo *mi,

	unsigned long start_pfn, unsigned long end_pfn)

{

	struct memblock_region *reg;

	unsigned int boot_pages;

	phys_addr_t bitmap;

	pg_data_t *pgdat;
@@ -180,12 +181,12 @@ static void __init arm_bootmem_init(struct meminfo *mi, 
	/*

	 * Reserve the memblock reserved regions in bootmem.

	 */

	for (i = 0; i < memblock.reserved.cnt; i++) {

		phys_addr_t start = memblock_start_pfn(&memblock.reserved, i);

		if (start >= start_pfn &&

		    memblock_end_pfn(&memblock.reserved, i) <= end_pfn)

	for_each_memblock(reserved, reg) {

		phys_addr_t start = memblock_region_base_pfn(reg);

		phys_addr_t end = memblock_region_end_pfn(reg);

		if (start >= start_pfn && end <= end_pfn)

			reserve_bootmem_node(pgdat, __pfn_to_phys(start),

				memblock_size_bytes(&memblock.reserved, i),

					     (end - start) << PAGE_SHIFT,

					     BOOTMEM_DEFAULT);

	}

}
@@ -247,10 +248,12 @@ static void arm_memory_present(void) 
#else

static void arm_memory_present(void)

{

	struct memblock_region *reg;

	int i;

	for (i = 0; i < memblock.memory.cnt; i++)

		memory_present(0, memblock_start_pfn(&memblock.memory, i),

				  memblock_end_pfn(&memblock.memory, i));



	for_each_memblock(memory, reg) {

		memory_present(0, memblock_region_base_pfn(reg),

			       memblock_region_end_pfn(reg));

}

#endif