The patch titled Subject: mm/hugetlb: remove unused arch hook prepare/release_hugepage has been added to the -mm tree. Its filename is mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Dominik Dingel <dingel@xxxxxxxxxxxxxxxxxx> Subject: mm/hugetlb: remove unused arch hook prepare/release_hugepage With s390 dropping support for emulated hugepages, the last user of arch_prepare_hugepage and arch_release_hugepage is gone. Signed-off-by: Dominik Dingel <dingel@xxxxxxxxxxxxxxxxxx> Acked-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 10 ---------- 1 file changed, 10 deletions(-) diff -puN mm/hugetlb.c~mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage mm/hugetlb.c --- a/mm/hugetlb.c~mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage +++ a/mm/hugetlb.c @@ -975,7 +975,6 @@ static void update_and_free_page(struct destroy_compound_gigantic_page(page, huge_page_order(h)); free_gigantic_page(page, huge_page_order(h)); } else { - arch_release_hugepage(page); __free_pages(page, huge_page_order(h)); } } @@ -1160,10 +1159,6 @@ static struct page *alloc_fresh_huge_pag __GFP_REPEAT|__GFP_NOWARN, huge_page_order(h)); if (page) { - if (arch_prepare_hugepage(page)) { - __free_pages(page, huge_page_order(h)); - return NULL; - } prep_new_huge_page(h, page, nid); } @@ -1315,11 +1310,6 @@ static struct page *alloc_buddy_huge_pag htlb_alloc_mask(h)|__GFP_COMP|__GFP_THISNODE| __GFP_REPEAT|__GFP_NOWARN, huge_page_order(h)); - if (page && arch_prepare_hugepage(page)) { - __free_pages(page, huge_page_order(h)); - page = NULL; - } - spin_lock(&hugetlb_lock); if (page) { INIT_LIST_HEAD(&page->lru); _ Patches currently in -mm which might be from dingel@xxxxxxxxxxxxxxxxxx are s390-mm-make-hugepages_supported-a-boot-time-decision.patch mm-hugetlb-remove-unused-arch-hook-prepare-release_hugepage.patch mm-hugetlb-remove-arch_prepare-release_hugepage-from-arch-headers.patch s390-hugetlb-remove-dead-code-for-sw-emulated-huge-pages.patch s390-mm-forward-check-for-huge-pmds-to-pmd_large.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html