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

Commit 96bbdb7e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "memblock: Fix memblock_overlaps_memory()"

parents fc86e522 56f347a6

include/linux/memblock.h

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ void memblock_enforce_memory_limit(phys_addr_t memory_limit); 
int memblock_is_memory(phys_addr_t addr);

int memblock_is_map_memory(phys_addr_t addr);

int memblock_is_region_memory(phys_addr_t base, phys_addr_t size);

int memblock_overlaps_memory(phys_addr_t base, phys_addr_t size);

bool memblock_overlaps_memory(phys_addr_t base, phys_addr_t size);

int memblock_is_reserved(phys_addr_t addr);

bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);

mm/memblock.c

+3 −2
Original line number Diff line number Diff line
@@ -1605,11 +1605,12 @@ 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)

bool __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;

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

}



/**