The patch titled Subject: mm/hugetlb.c: avoid bogus counter of surplus huge page has been added to the -mm tree. Its filename is mm-hugetlb-avoid-bogus-counter-of-surplus-huge-page.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: Hillf Danton <dhillf@xxxxxxxxx> Subject: mm/hugetlb.c: avoid bogus counter of surplus huge page If we have to hand back the newly allocated huge page to page allocator, for any reason, the changed counter should be recovered. This affects only s390 at present. Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx> Reviewed-by: Michal Hocko <mhocko@xxxxxxx> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/hugetlb.c~mm-hugetlb-avoid-bogus-counter-of-surplus-huge-page mm/hugetlb.c --- a/mm/hugetlb.c~mm-hugetlb-avoid-bogus-counter-of-surplus-huge-page +++ a/mm/hugetlb.c @@ -800,7 +800,7 @@ static struct page *alloc_buddy_huge_pag if (page && arch_prepare_hugepage(page)) { __free_pages(page, huge_page_order(h)); - return NULL; + page = NULL; } spin_lock(&hugetlb_lock); _ Subject: Subject: mm/hugetlb.c: avoid bogus counter of surplus huge page Patches currently in -mm which might be from dhillf@xxxxxxxxx are origin.patch mm-hugetlb-fix-non-atomic-enqueue-of-huge-page.patch mm-hugetlb-avoid-bogus-counter-of-surplus-huge-page.patch linux-next.patch hugetlb-detect-race-upon-page-allocation-failure-during-cow.patch hugetlb-clarify-hugetlb_instantiation_mutex-usage.patch mm-compaction-push-isolate-search-base-of-compact-control-one-pfn-ahead.patch mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma.patch mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma-fix.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