diff options
Diffstat (limited to 'include/linux/memblock.h')
| -rw-r--r-- | include/linux/memblock.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index cc4b01972060..c518eb589260 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
| @@ -77,6 +77,8 @@ int memblock_remove(phys_addr_t base, phys_addr_t size); | |||
| 77 | int memblock_free(phys_addr_t base, phys_addr_t size); | 77 | int memblock_free(phys_addr_t base, phys_addr_t size); |
| 78 | int memblock_reserve(phys_addr_t base, phys_addr_t size); | 78 | int memblock_reserve(phys_addr_t base, phys_addr_t size); |
| 79 | void memblock_trim_memory(phys_addr_t align); | 79 | void memblock_trim_memory(phys_addr_t align); |
| 80 | bool memblock_overlaps_region(struct memblock_type *type, | ||
| 81 | phys_addr_t base, phys_addr_t size); | ||
| 80 | int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size); | 82 | int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size); |
| 81 | int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); | 83 | int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); |
| 82 | int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); | 84 | int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); |
| @@ -323,7 +325,7 @@ void memblock_enforce_memory_limit(phys_addr_t memory_limit); | |||
| 323 | int memblock_is_memory(phys_addr_t addr); | 325 | int memblock_is_memory(phys_addr_t addr); |
| 324 | int memblock_is_region_memory(phys_addr_t base, phys_addr_t size); | 326 | int memblock_is_region_memory(phys_addr_t base, phys_addr_t size); |
| 325 | int memblock_is_reserved(phys_addr_t addr); | 327 | int memblock_is_reserved(phys_addr_t addr); |
| 326 | int memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); | 328 | bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size); |
| 327 | 329 | ||
| 328 | extern void __memblock_dump_all(void); | 330 | extern void __memblock_dump_all(void); |
| 329 | 331 | ||
