diff options
-rw-r--r-- | include/linux/memblock.h | 4 | ||||
-rw-r--r-- | mm/memblock.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index c1315c331a8e..c077227e6d53 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
@@ -108,9 +108,6 @@ void memblock_discard(void); | |||
108 | #define memblock_dbg(fmt, ...) \ | 108 | #define memblock_dbg(fmt, ...) \ |
109 | if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) | 109 | if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) |
110 | 110 | ||
111 | phys_addr_t memblock_find_in_range_node(phys_addr_t size, phys_addr_t align, | ||
112 | phys_addr_t start, phys_addr_t end, | ||
113 | int nid, enum memblock_flags flags); | ||
114 | phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end, | 111 | phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end, |
115 | phys_addr_t size, phys_addr_t align); | 112 | phys_addr_t size, phys_addr_t align); |
116 | void memblock_allow_resize(void); | 113 | void memblock_allow_resize(void); |
@@ -127,7 +124,6 @@ int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); | |||
127 | int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); | 124 | int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); |
128 | int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); | 125 | int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); |
129 | int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); | 126 | int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); |
130 | enum memblock_flags choose_memblock_flags(void); | ||
131 | 127 | ||
132 | unsigned long memblock_free_all(void); | 128 | unsigned long memblock_free_all(void); |
133 | void reset_node_managed_pages(pg_data_t *pgdat); | 129 | void reset_node_managed_pages(pg_data_t *pgdat); |
diff --git a/mm/memblock.c b/mm/memblock.c index 31e89dac9a23..618f94a1eedb 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
@@ -132,7 +132,7 @@ static int memblock_can_resize __initdata_memblock; | |||
132 | static int memblock_memory_in_slab __initdata_memblock = 0; | 132 | static int memblock_memory_in_slab __initdata_memblock = 0; |
133 | static int memblock_reserved_in_slab __initdata_memblock = 0; | 133 | static int memblock_reserved_in_slab __initdata_memblock = 0; |
134 | 134 | ||
135 | enum memblock_flags __init_memblock choose_memblock_flags(void) | 135 | static enum memblock_flags __init_memblock choose_memblock_flags(void) |
136 | { | 136 | { |
137 | return system_has_some_mirror ? MEMBLOCK_MIRROR : MEMBLOCK_NONE; | 137 | return system_has_some_mirror ? MEMBLOCK_MIRROR : MEMBLOCK_NONE; |
138 | } | 138 | } |
@@ -261,7 +261,7 @@ __memblock_find_range_top_down(phys_addr_t start, phys_addr_t end, | |||
261 | * Return: | 261 | * Return: |
262 | * Found address on success, 0 on failure. | 262 | * Found address on success, 0 on failure. |
263 | */ | 263 | */ |
264 | phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size, | 264 | static phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size, |
265 | phys_addr_t align, phys_addr_t start, | 265 | phys_addr_t align, phys_addr_t start, |
266 | phys_addr_t end, int nid, | 266 | phys_addr_t end, int nid, |
267 | enum memblock_flags flags) | 267 | enum memblock_flags flags) |