diff options
author | Yaowei Bai <baiyaowei@cmss.chinamobile.com> | 2018-02-06 18:41:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-06 21:32:47 -0500 |
commit | 937f0c2675a1ad6f94e0768dbb5379954d9953ab (patch) | |
tree | 772a7d9968eaec912f9d593203e8ed999b62dbbc | |
parent | 22ad305741bc367abb2180986c99effaa1e41787 (diff) |
mm/memblock: memblock_is_map/region_memory can be boolean
Make memblock_is_map/region_memory return bool due to these two
functions only using either true or false as its return value.
No functional change.
Link: http://lkml.kernel.org/r/1513266622-15860-2-git-send-email-baiyaowei@cmss.chinamobile.com
Signed-off-by: Yaowei Bai <baiyaowei@cmss.chinamobile.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/memblock.h | 4 | ||||
-rw-r--r-- | mm/memblock.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 7ed0f7782d16..8be5077efb5f 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
@@ -332,8 +332,8 @@ void memblock_enforce_memory_limit(phys_addr_t memory_limit); | |||
332 | void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size); | 332 | void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size); |
333 | void memblock_mem_limit_remove_map(phys_addr_t limit); | 333 | void memblock_mem_limit_remove_map(phys_addr_t limit); |
334 | bool memblock_is_memory(phys_addr_t addr); | 334 | bool memblock_is_memory(phys_addr_t addr); |
335 | int memblock_is_map_memory(phys_addr_t addr); | 335 | bool memblock_is_map_memory(phys_addr_t addr); |
336 | int memblock_is_region_memory(phys_addr_t base, phys_addr_t size); | 336 | bool memblock_is_region_memory(phys_addr_t base, phys_addr_t size); |
337 | bool memblock_is_reserved(phys_addr_t addr); | 337 | bool memblock_is_reserved(phys_addr_t addr); |
338 | bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); | 338 | bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); |
339 | 339 | ||
diff --git a/mm/memblock.c b/mm/memblock.c index 46aacdfa4f4d..5a9ca2a1751b 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
@@ -1654,7 +1654,7 @@ bool __init_memblock memblock_is_memory(phys_addr_t addr) | |||
1654 | return memblock_search(&memblock.memory, addr) != -1; | 1654 | return memblock_search(&memblock.memory, addr) != -1; |
1655 | } | 1655 | } |
1656 | 1656 | ||
1657 | int __init_memblock memblock_is_map_memory(phys_addr_t addr) | 1657 | bool __init_memblock memblock_is_map_memory(phys_addr_t addr) |
1658 | { | 1658 | { |
1659 | int i = memblock_search(&memblock.memory, addr); | 1659 | int i = memblock_search(&memblock.memory, addr); |
1660 | 1660 | ||
@@ -1690,13 +1690,13 @@ int __init_memblock memblock_search_pfn_nid(unsigned long pfn, | |||
1690 | * RETURNS: | 1690 | * RETURNS: |
1691 | * 0 if false, non-zero if true | 1691 | * 0 if false, non-zero if true |
1692 | */ | 1692 | */ |
1693 | int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) | 1693 | bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) |
1694 | { | 1694 | { |
1695 | int idx = memblock_search(&memblock.memory, base); | 1695 | int idx = memblock_search(&memblock.memory, base); |
1696 | phys_addr_t end = base + memblock_cap_size(base, &size); | 1696 | phys_addr_t end = base + memblock_cap_size(base, &size); |
1697 | 1697 | ||
1698 | if (idx == -1) | 1698 | if (idx == -1) |
1699 | return 0; | 1699 | return false; |
1700 | return (memblock.memory.regions[idx].base + | 1700 | return (memblock.memory.regions[idx].base + |
1701 | memblock.memory.regions[idx].size) >= end; | 1701 | memblock.memory.regions[idx].size) >= end; |
1702 | } | 1702 | } |