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

Commit 083be476 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "memblock: Add memblock_overlaps_memory()" into msm-4.8

parents 8e9ee334 39ea1a3a

include/linux/memblock.h

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ int memblock_is_map_memory(phys_addr_t addr); 
int memblock_is_region_memory(phys_addr_t base, phys_addr_t size);

bool memblock_is_reserved(phys_addr_t addr);

bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);

int memblock_overlaps_memory(phys_addr_t base, phys_addr_t size);



extern void __memblock_dump_all(void);

mm/memblock.c

+7 −0
Original line number Diff line number Diff line
@@ -1615,6 +1615,13 @@ int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size 
		 memblock.memory.regions[idx].size) >= end;

}



int __init_memblock memblock_overlaps_memory(phys_addr_t base, phys_addr_t size)

{

	memblock_cap_size(base, &size);



	return memblock_overlaps_region(&memblock.memory, base, size) >= 0;

}



/**

 * memblock_is_region_reserved - check if a region intersects reserved memory

 * @base: base of region to check