evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "memblock: Fix memblock_overlaps_memory()"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-03 21:45:04 -07:00 • committed by Gerrit - the friendly Code Review server
commit 96bbdb7e76
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/memblock.h
View file

@ -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_memory(phys_addr_t addr);
int memblock_is_map_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_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); int 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);

5
mm/memblock.c
View file

@ -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; 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); memblock_cap_size(base, &size);
return memblock_overlaps_region(&memblock.memory, base, size) >= 0; return memblock_overlaps_region(&memblock.memory, base, size);
} }
/** /**