|
@@ -2139,16 +2139,9 @@ static void __init gather_bootmem_prealloc(void)
|
|
struct huge_bootmem_page *m;
|
|
struct huge_bootmem_page *m;
|
|
|
|
|
|
list_for_each_entry(m, &huge_boot_pages, list) {
|
|
list_for_each_entry(m, &huge_boot_pages, list) {
|
|
|
|
+ struct page *page = virt_to_page(m);
|
|
struct hstate *h = m->hstate;
|
|
struct hstate *h = m->hstate;
|
|
- struct page *page;
|
|
|
|
|
|
|
|
-#ifdef CONFIG_HIGHMEM
|
|
|
|
- page = pfn_to_page(m->phys >> PAGE_SHIFT);
|
|
|
|
- memblock_free_late(__pa(m),
|
|
|
|
- sizeof(struct huge_bootmem_page));
|
|
|
|
-#else
|
|
|
|
- page = virt_to_page(m);
|
|
|
|
-#endif
|
|
|
|
WARN_ON(page_count(page) != 1);
|
|
WARN_ON(page_count(page) != 1);
|
|
prep_compound_huge_page(page, h->order);
|
|
prep_compound_huge_page(page, h->order);
|
|
WARN_ON(PageReserved(page));
|
|
WARN_ON(PageReserved(page));
|