The patch titled Subject: mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix has been added to the -mm tree. Its filename is mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-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/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix fix bogus fix Cc: Jia He <jia.he@xxxxxxxxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN mm/memblock.c~mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix mm/memblock.c --- a/mm/memblock.c~mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix +++ a/mm/memblock.c @@ -1232,6 +1232,7 @@ int __init_memblock memblock_set_node(ph #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ #ifdef CONFIG_HAVE_MEMBLOCK_PFN_VALID +static int early_region_idx __initdata_memblock = -1; unsigned long __init_memblock memblock_next_valid_pfn(unsigned long pfn) { struct memblock_type *type = &memblock.memory; @@ -1240,7 +1241,6 @@ unsigned long __init_memblock memblock_n uint mid, left = 0; unsigned long start_pfn, end_pfn, next_start_pfn; phys_addr_t addr = PFN_PHYS(++pfn); - static int early_region_idx __initdata_memblock = -1; /* fast path, return pfn+1 if next pfn is in the same region */ if (early_region_idx != -1) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-zero-out-the-vma-in-vma_init.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix.patch mm-page_alloc-reduce-unnecessary-binary-search-in-memblock_next_valid_pfn-fix-fix.patch mm-memblock-introduce-memblock_search_pfn_regions-fix.patch mm-soft-offline-close-the-race-against-page-allocation-fix.patch mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch