aboutsummaryrefslogtreecommitdiffstats
path: root/mm/sparse-vmemmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/sparse-vmemmap.c')
-rw-r--r--mm/sparse-vmemmap.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
index 376dcf05a39c..d012c9e2811b 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -74,7 +74,7 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)
74} 74}
75 75
76/* need to make sure size is all the same during early stage */ 76/* need to make sure size is all the same during early stage */
77static void * __meminit alloc_block_buf(unsigned long size, int node) 77void * __meminit vmemmap_alloc_block_buf(unsigned long size, int node)
78{ 78{
79 void *ptr; 79 void *ptr;
80 80
@@ -129,7 +129,7 @@ static unsigned long __meminit vmem_altmap_alloc(struct vmem_altmap *altmap,
129 return pfn + nr_align; 129 return pfn + nr_align;
130} 130}
131 131
132static void * __meminit altmap_alloc_block_buf(unsigned long size, 132void * __meminit altmap_alloc_block_buf(unsigned long size,
133 struct vmem_altmap *altmap) 133 struct vmem_altmap *altmap)
134{ 134{
135 unsigned long pfn, nr_pfns; 135 unsigned long pfn, nr_pfns;
@@ -153,15 +153,6 @@ static void * __meminit altmap_alloc_block_buf(unsigned long size,
153 return ptr; 153 return ptr;
154} 154}
155 155
156/* need to make sure size is all the same during early stage */
157void * __meminit __vmemmap_alloc_block_buf(unsigned long size, int node,
158 struct vmem_altmap *altmap)
159{
160 if (altmap)
161 return altmap_alloc_block_buf(size, altmap);
162 return alloc_block_buf(size, node);
163}
164
165void __meminit vmemmap_verify(pte_t *pte, int node, 156void __meminit vmemmap_verify(pte_t *pte, int node,
166 unsigned long start, unsigned long end) 157 unsigned long start, unsigned long end)
167{ 158{
@@ -178,7 +169,7 @@ pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node)
178 pte_t *pte = pte_offset_kernel(pmd, addr); 169 pte_t *pte = pte_offset_kernel(pmd, addr);
179 if (pte_none(*pte)) { 170 if (pte_none(*pte)) {
180 pte_t entry; 171 pte_t entry;
181 void *p = alloc_block_buf(PAGE_SIZE, node); 172 void *p = vmemmap_alloc_block_buf(PAGE_SIZE, node);
182 if (!p) 173 if (!p)
183 return NULL; 174 return NULL;
184 entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL); 175 entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL);