diff options
Diffstat (limited to 'include/linux/memblock.h')
-rw-r--r-- | include/linux/memblock.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 77d427974f57..bae11c7e7bf3 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
@@ -61,6 +61,7 @@ extern int memblock_debug; | |||
61 | #ifdef CONFIG_ARCH_DISCARD_MEMBLOCK | 61 | #ifdef CONFIG_ARCH_DISCARD_MEMBLOCK |
62 | #define __init_memblock __meminit | 62 | #define __init_memblock __meminit |
63 | #define __initdata_memblock __meminitdata | 63 | #define __initdata_memblock __meminitdata |
64 | void memblock_discard(void); | ||
64 | #else | 65 | #else |
65 | #define __init_memblock | 66 | #define __init_memblock |
66 | #define __initdata_memblock | 67 | #define __initdata_memblock |
@@ -74,8 +75,6 @@ phys_addr_t memblock_find_in_range_node(phys_addr_t size, phys_addr_t align, | |||
74 | int nid, ulong flags); | 75 | int nid, ulong flags); |
75 | phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end, | 76 | phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end, |
76 | phys_addr_t size, phys_addr_t align); | 77 | phys_addr_t size, phys_addr_t align); |
77 | phys_addr_t get_allocated_memblock_reserved_regions_info(phys_addr_t *addr); | ||
78 | phys_addr_t get_allocated_memblock_memory_regions_info(phys_addr_t *addr); | ||
79 | void memblock_allow_resize(void); | 78 | void memblock_allow_resize(void); |
80 | int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid); | 79 | int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid); |
81 | int memblock_add(phys_addr_t base, phys_addr_t size); | 80 | int memblock_add(phys_addr_t base, phys_addr_t size); |
@@ -110,6 +109,9 @@ void __next_mem_range_rev(u64 *idx, int nid, ulong flags, | |||
110 | void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start, | 109 | void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start, |
111 | phys_addr_t *out_end); | 110 | phys_addr_t *out_end); |
112 | 111 | ||
112 | void __memblock_free_early(phys_addr_t base, phys_addr_t size); | ||
113 | void __memblock_free_late(phys_addr_t base, phys_addr_t size); | ||
114 | |||
113 | /** | 115 | /** |
114 | * for_each_mem_range - iterate through memblock areas from type_a and not | 116 | * for_each_mem_range - iterate through memblock areas from type_a and not |
115 | * included in type_b. Or just type_a if type_b is NULL. | 117 | * included in type_b. Or just type_a if type_b is NULL. |