The patch titled Subject: mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix has been added to the -mm tree. Its filename is mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.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: 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 @@ -5445,8 +5445,9 @@ void __meminit memmap_init_zone(unsigned * end_pfn), such that we hit a valid pfn (or end_pfn) * on our next iteration of the loop. */ - if (IS_ENABLED(CONFIG_HAVE_MEMBLOCK)) - pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1; +#ifdef CONFIG_HAVE_MEMBLOCK + pfn = memblock_next_valid_pfn(pfn, end_pfn) - 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-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