mm/hugetlb: remove gigantic page support for HIGHMEM

This reverts ee8f248d266e ("hugetlb: add phys addr to struct
huge_bootmem_page").

At one time powerpc used this field and supporting code.  However that
was removed with commit 79cc38ded1e1 ("powerpc/mm/hugetlb: Add support
for reserving gigantic huge pages via kernel command line").

There are no users of this field and supporting code, so remove it.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Mike Kravetz <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Cc: "Aneesh Kumar K . V" <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Cannon Matthews <[email protected]>
Cc: Becky Bruce <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 36fa6a2a82e310f175b1f6595d3b8b8280587a5c..c39d9170a8a0293c03d0b2abf9e0222d3f2213b1 100644 (file)
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -348,9 +348,6 @@ 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(struct vm_area_struct *vma,

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index f1bcaae0d73a7114e683d132c462b467f9e2725f..4cea30ac503383ab0b537c079021a0cf3d1454bc 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2139,16 +2139,9 @@ 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);
-               memblock_free_late(__pa(m),
-                                  sizeof(struct huge_bootmem_page));
-#else
-               page = virt_to_page(m);
-#endif
                WARN_ON(page_count(page) != 1);
                prep_compound_huge_page(page, h->order);
                WARN_ON(PageReserved(page));