2 files changed, 12 insertions, 1 deletions

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 59225ef27d15..19644e0016bd 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -231,6 +231,9 @@ struct hstate {
 struct huge_bootmem_page {
         struct list_head list;
         struct hstate *hstate;
+#ifdef CONFIG_HIGHMEM
+        phys_addr_t phys;
+#endif
 };
 
 struct page *alloc_huge_page_node(struct hstate *h, int nid);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index bfcf153bc829..c6d342d313c7 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1105,8 +1105,16 @@ static void __init gather_bootmem_prealloc(void)
         struct huge_bootmem_page *m;
 
         list_for_each_entry(m, &huge_boot_pages, list) {
-                struct page *page = virt_to_page(m);
                 struct hstate *h = m->hstate;
+                struct page *page;
+
+#ifdef CONFIG_HIGHMEM
+                page = pfn_to_page(m->phys >> PAGE_SHIFT);
+                free_bootmem_late((unsigned long)m,
+                                  sizeof(struct huge_bootmem_page));
+#else
+                page = virt_to_page(m);
+#endif
                 __ClearPageReserved(page);
                 WARN_ON(page_count(page) != 1);
                 prep_compound_huge_page(page, h->order);