mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
mm/memblock.c: make memblock_overlaps_region() return bool.
memblock_overlaps_region() checks if the given memblock region intersects a region in memblock. If so, it returns the index of the intersected region. But its only caller is memblock_is_region_reserved(), and it returns 0 if false, non-zero if true. Both of these should return bool. Signed-off-by: Tang Chen <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Yasuaki Ishimatsu <[email protected]> Cc: Luiz Capitulino <[email protected]> Cc: Xishi Qiu <[email protected]> Cc: Will Deacon <[email protected]> Cc: Vladimir Murzin <[email protected]> Cc: Fabian Frederick <[email protected]> Cc: Alexander Kuleshov <[email protected]> Cc: Baoquan He <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
72079ba0df
commit
c5c5c9d100
2 changed files with 6 additions and 6 deletions
|
|
@ -91,7 +91,7 @@ static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, p
|
|||
return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
|
||||
}
|
||||
|
||||
static long __init_memblock memblock_overlaps_region(struct memblock_type *type,
|
||||
static bool __init_memblock memblock_overlaps_region(struct memblock_type *type,
|
||||
phys_addr_t base, phys_addr_t size)
|
||||
{
|
||||
unsigned long i;
|
||||
|
|
@ -103,7 +103,7 @@ static long __init_memblock memblock_overlaps_region(struct memblock_type *type,
|
|||
break;
|
||||
}
|
||||
|
||||
return (i < type->cnt) ? i : -1;
|
||||
return i < type->cnt;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1566,12 +1566,12 @@ int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size
|
|||
* Check if the region [@base, @base+@size) intersects a reserved memory block.
|
||||
*
|
||||
* RETURNS:
|
||||
* 0 if false, non-zero if true
|
||||
* True if they intersect, false if not.
|
||||
*/
|
||||
int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
|
||||
bool __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
|
||||
{
|
||||
memblock_cap_size(base, &size);
|
||||
return memblock_overlaps_region(&memblock.reserved, base, size) >= 0;
|
||||
return memblock_overlaps_region(&memblock.reserved, base, size);
|
||||
}
|
||||
|
||||
void __init_memblock memblock_trim_memory(phys_addr_t align)
|
||||
|
|
|
|||
Loading…
Reference in a new issue