diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-28 14:13:32 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-28 14:13:32 (GMT) |
| commit | 084eedbddaa526f53b20291ee7176be269620301 (patch) | |
| tree | ffcc23dd6b939e1db3d7feb1bf561073165af6be /include | |
| parent | 3e71247d343d3d9e4ff996255ac58b73dcf1ce27 (diff) | |
| parent | 64e72fbc97b29298f7aa89c30fb221e1a9d02fed (diff) | |
| download | linux-084eedbddaa526f53b20291ee7176be269620301.tar.xz | |
Merge branch 'lsk/kdump/for-v4.9' into linux-linaro-lsk-v4.9
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/memblock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index e8fba68..7ad0b3a 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -92,6 +92,7 @@ int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size); int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); +int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); ulong choose_memblock_flags(void); /* Low level functions */ @@ -333,6 +334,7 @@ phys_addr_t memblock_mem_size(unsigned long limit_pfn); phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); 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_mem_limit_remove_map(phys_addr_t limit); bool memblock_is_memory(phys_addr_t addr); int memblock_is_map_memory(phys_addr_t addr); |