diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-03 21:45:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-03 21:45:03 -0700 |
| commit | 96bbdb7e7629a37a3b6895044d1429121468ad7d (patch) | |
| tree | d43f87c16e746ee0971999d955d5dac3ead793a5 /include | |
| parent | fc86e52281ffd5c124f03de495fd52b7c67da491 (diff) | |
| parent | 56f347a69c2e17dd16a75ee83777bffd94dd2328 (diff) | |
Merge "memblock: Fix memblock_overlaps_memory()"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/memblock.h | 2 |
1 files changed, 1 insertions, 1 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); |