openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Yaowei Bai 2018-02-06 15:41:18 -08:00 committed by Linus Torvalds
parent 22ad305741
commit 937f0c2675
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/memblock.h
View File

@ -332,8 +332,8 @@ void memblock_enforce_memory_limit(phys_addr_t memory_limit);
void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size); void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size);
void memblock_mem_limit_remove_map(phys_addr_t limit); void memblock_mem_limit_remove_map(phys_addr_t limit);
bool memblock_is_memory(phys_addr_t addr); bool memblock_is_memory(phys_addr_t addr);
int memblock_is_map_memory(phys_addr_t addr); bool memblock_is_map_memory(phys_addr_t addr);
int memblock_is_region_memory(phys_addr_t base, phys_addr_t size); bool memblock_is_region_memory(phys_addr_t base, phys_addr_t size);
bool memblock_is_reserved(phys_addr_t addr); bool memblock_is_reserved(phys_addr_t addr);
bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);

6
mm/memblock.c
View File

@ -1654,7 +1654,7 @@ bool __init_memblock memblock_is_memory(phys_addr_t addr)
return memblock_search(&memblock.memory, addr) != -1; return memblock_search(&memblock.memory, addr) != -1;
} }
int __init_memblock memblock_is_map_memory(phys_addr_t addr) bool __init_memblock memblock_is_map_memory(phys_addr_t addr)
{ {
int i = memblock_search(&memblock.memory, addr); int i = memblock_search(&memblock.memory, addr);
@ -1690,13 +1690,13 @@ int __init_memblock memblock_search_pfn_nid(unsigned long pfn,
* RETURNS: * RETURNS:
* 0 if false, non-zero if true * 0 if false, non-zero if true
*/ */
int __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size) bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size)
{ {
int idx = memblock_search(&memblock.memory, base); int idx = memblock_search(&memblock.memory, base);
phys_addr_t end = base + memblock_cap_size(base, &size); phys_addr_t end = base + memblock_cap_size(base, &size);
if (idx == -1) if (idx == -1)
return 0; return false;
return (memblock.memory.regions[idx].base + return (memblock.memory.regions[idx].base +
memblock.memory.regions[idx].size) >= end; memblock.memory.regions[idx].size) >= end;
} }