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

Commit 56f347a6 authored by Stephen Boyd's avatar Stephen Boyd Committed by Satya Durga Srinivasu Prabhala
Browse files

memblock: Fix memblock_overlaps_memory() 



This function always returns true, because it calls
memblock_overlaps_region() which returns a bool now. Change the
signature to bool and pass it on up instead.

Change-Id: I4b6403b823d20552a28006e35083d8056346dc51
Cc: Patrick Daly <pdaly@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
[satyap@codeaurora.org: trivial merge conflict resolution]
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
parent bd208931

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);

}



/**