The patch titled Subject: mm-introduce-madv_cold-fix has been added to the -mm tree. Its filename is mm-introduce-madv_cold-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-introduce-madv_cold-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-introduce-madv_cold-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-introduce-madv_cold-fix resolve conflicts with hmm.git Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Jason Gunthorpe <jgg@xxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/madvise.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) --- a/mm/madvise.c~mm-introduce-madv_cold-fix +++ a/mm/madvise.c @@ -419,18 +419,16 @@ regular_page: return 0; } +static const struct mm_walk_ops cold_walk_ops = { + .pmd_entry = madvise_cold_pte_range, +}; + static void madvise_cold_page_range(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long addr, unsigned long end) { - struct mm_walk cold_walk = { - .pmd_entry = madvise_cold_pte_range, - .mm = vma->vm_mm, - .private = tlb, - }; - tlb_start_vma(tlb, vma); - walk_page_range(addr, end, &cold_walk); + walk_page_range(vma->vm_mm, addr, end, &cold_walk_ops, NULL); tlb_end_vma(tlb, vma); } _ 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-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