The patch titled Subject: mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix has been removed from the -mm tree. Its filename was mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch This patch was dropped because it was folded into mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma.patch ------------------------------------------------------ From: Michal Hocko <mhocko@xxxxxxxxxx> Subject: mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix fix build Link: http://lkml.kernel.org/r/20180222072037.GC30681@xxxxxxxxxxxxxx Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Eugeniu Rosca <erosca@xxxxxxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN mm/page_alloc.c~mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix mm/page_alloc.c --- a/mm/page_alloc.c~mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix +++ a/mm/page_alloc.c @@ -5449,9 +5449,10 @@ void __meminit memmap_init_zone(unsigned * the valid region but still depends on correct page * metadata. */ - if (IS_ENABLED(CONFIG_HAVE_MEMBLOCK)) - pfn = (memblock_next_valid_pfn(pfn) & +#ifdef CONFIG_HAVE_MEMBLOCK + pfn = (memblock_next_valid_pfn(pfn) & ~(pageblock_nr_pages-1)) - 1; +#endif continue; } if (!early_pfn_in_nid(pfn, nid)) _ Patches currently in -mm which might be from mhocko@xxxxxxxxxx are mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma.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