diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2017-03-01 16:42:02 -0800 |
|---|---|---|
| committer | Satya Durga Srinivasu Prabhala <satyap@codeaurora.org> | 2017-10-03 12:03:52 -0700 |
| commit | 56f347a69c2e17dd16a75ee83777bffd94dd2328 (patch) | |
| tree | d0cf61be9817ccf1a0dea22058a558090988d961 | |
| parent | bd208931386764a067e10e686d4735d03830e9d6 (diff) | |
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: Stephen Boyd <sboyd@codeaurora.org>
[satyap@codeaurora.org: trivial merge conflict resolution]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
| -rw-r--r-- | include/linux/memblock.h | 2 | ||||
| -rw-r--r-- | mm/memblock.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index d4b56351027b..2d79ec1496e5 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -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); diff --git a/mm/memblock.c b/mm/memblock.c index 351a4840a407..241225579f3a 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -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); } /** |