diff options
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r-- | mm/hugetlb.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 75c0eef52c5d..a8c3087089d8 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -975,7 +975,6 @@ static void update_and_free_page(struct hstate *h, struct page *page) | |||
975 | destroy_compound_gigantic_page(page, huge_page_order(h)); | 975 | destroy_compound_gigantic_page(page, huge_page_order(h)); |
976 | free_gigantic_page(page, huge_page_order(h)); | 976 | free_gigantic_page(page, huge_page_order(h)); |
977 | } else { | 977 | } else { |
978 | arch_release_hugepage(page); | ||
979 | __free_pages(page, huge_page_order(h)); | 978 | __free_pages(page, huge_page_order(h)); |
980 | } | 979 | } |
981 | } | 980 | } |
@@ -1160,10 +1159,6 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid) | |||
1160 | __GFP_REPEAT|__GFP_NOWARN, | 1159 | __GFP_REPEAT|__GFP_NOWARN, |
1161 | huge_page_order(h)); | 1160 | huge_page_order(h)); |
1162 | if (page) { | 1161 | if (page) { |
1163 | if (arch_prepare_hugepage(page)) { | ||
1164 | __free_pages(page, huge_page_order(h)); | ||
1165 | return NULL; | ||
1166 | } | ||
1167 | prep_new_huge_page(h, page, nid); | 1162 | prep_new_huge_page(h, page, nid); |
1168 | } | 1163 | } |
1169 | 1164 | ||
@@ -1315,11 +1310,6 @@ static struct page *alloc_buddy_huge_page(struct hstate *h, int nid) | |||
1315 | htlb_alloc_mask(h)|__GFP_COMP|__GFP_THISNODE| | 1310 | htlb_alloc_mask(h)|__GFP_COMP|__GFP_THISNODE| |
1316 | __GFP_REPEAT|__GFP_NOWARN, huge_page_order(h)); | 1311 | __GFP_REPEAT|__GFP_NOWARN, huge_page_order(h)); |
1317 | 1312 | ||
1318 | if (page && arch_prepare_hugepage(page)) { | ||
1319 | __free_pages(page, huge_page_order(h)); | ||
1320 | page = NULL; | ||
1321 | } | ||
1322 | |||
1323 | spin_lock(&hugetlb_lock); | 1313 | spin_lock(&hugetlb_lock); |
1324 | if (page) { | 1314 | if (page) { |
1325 | INIT_LIST_HEAD(&page->lru); | 1315 | INIT_LIST_HEAD(&page->lru); |