The patch titled Subject: mm-vmalloc-move-area-pages-after-if-statement-fix has been added to the -mm tree. Its filename is mm-vmalloc-move-area-pages-after-if-statement-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-vmalloc-move-area-pages-after-if-statement-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-vmalloc-move-area-pages-after-if-statement-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-vmalloc-move-area-pages-after-if-statement-fix give area->pages the same treatment Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx> Cc: Austin Kim <austindh.kim@xxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx> Cc: Rick Edgecombe <rick.p.edgecombe@xxxxxxxxx> Cc: Roman Gushchin <guro@xxxxxx> Cc: Roman Penyaev <rpenyaev@xxxxxxx> Cc: Uladzislau Rezki (Sony) <urezki@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/vmalloc.c~mm-vmalloc-move-area-pages-after-if-statement-fix +++ a/mm/vmalloc.c @@ -2409,7 +2409,6 @@ static void *__vmalloc_area_node(struct nr_pages = get_vm_area_size(area) >> PAGE_SHIFT; array_size = (nr_pages * sizeof(struct page *)); - area->nr_pages = nr_pages; /* Please note that the recursion is strictly bounded. */ if (array_size > PAGE_SIZE) { pages = __vmalloc_node(array_size, 1, nested_gfp|highmem_mask, @@ -2425,6 +2424,7 @@ static void *__vmalloc_area_node(struct } area->pages = pages; + area->nr_pages = nr_pages; for (i = 0; i < area->nr_pages; i++) { struct page *page; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-zsmallocc-fix-build-when-config_compaction=n.patch ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch mm.patch mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes.patch mm-kmemleak-use-the-memory-pool-for-early-allocations-checkpatch-fixes-fix.patch lib-test_kasan-add-roundtrip-tests-checkpatch-fixes.patch mm-introduce-page_shift-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch mm-memory_hotplug-remove-move_pfn_range-fix.patch mm-memory_hotplug-make-sure-the-pfn-is-aligned-to-the-order-when-onlining-fix.patch mm-vmalloc-move-area-pages-after-if-statement-fix.patch mm-z3foldc-remove-useless-code-in-z3fold_page_isolate-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch psi-annotate-refault-stalls-from-io-submission-fix.patch psi-annotate-refault-stalls-from-io-submission-fix-2.patch mm-mmapc-refine-find_vma_prev-with-rb_last-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch diff-sucks.patch mm-introduce-madv_cold-fix.patch mm-introduce-madv_pageout-fix-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch