|
@@ -253,9 +253,9 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
|
|
|
|
|
|
pt_dir = pte_offset_kernel(pm_dir, address);
|
|
|
if (pte_none(*pt_dir)) {
|
|
|
- unsigned long new_page;
|
|
|
+ void *new_page;
|
|
|
|
|
|
- new_page =__pa(vmem_alloc_pages(0));
|
|
|
+ new_page = vmemmap_alloc_block(PAGE_SIZE, node);
|
|
|
if (!new_page)
|
|
|
goto out;
|
|
|
pte_val(*pt_dir) =
|
|
@@ -263,7 +263,6 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
|
|
|
}
|
|
|
address += PAGE_SIZE;
|
|
|
}
|
|
|
- memset((void *)start, 0, end - start);
|
|
|
ret = 0;
|
|
|
out:
|
|
|
return ret;
|