The patch titled
Subject: mglru-vs-maple-tree
has been added to the -mm tree. Its filename is
mglru-vs-maple-tree.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mglru-vs-maple-tree.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mglru-vs-maple-tree.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: mglru-vs-maple-tree
nasty, but it compiles
Cc: Yu Zhao <yuzhao@xxxxxxxxxx>
Cc: Liam Howlett <liam.howlett@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/vmscan.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/mm/vmscan.c~mglru-vs-maple-tree
+++ a/mm/vmscan.c
@@ -3704,7 +3704,7 @@ static bool get_next_vma(struct mm_walk
while (walk->vma) {
if (next >= walk->vma->vm_end) {
- walk->vma = walk->vma->vm_next;
+ walk->vma = find_vma(walk->mm, walk->vma->vm_end);
continue;
}
@@ -3712,7 +3712,7 @@ static bool get_next_vma(struct mm_walk
return false;
if (should_skip_vma(walk->vma->vm_start, walk->vma->vm_end, walk)) {
- walk->vma = walk->vma->vm_next;
+ walk->vma = find_vma(walk->mm, walk->vma->vm_end);
continue;
}
@@ -4062,7 +4062,7 @@ static void walk_mm(struct lruvec *lruve
/* the caller might be holding the lock for write */
if (mmap_read_trylock(mm)) {
unsigned long start = walk->next_addr;
- unsigned long end = mm->highest_vm_end;
+ unsigned long end = TASK_SIZE;
err = walk_page_range(mm, start, end, &mm_walk_ops, walk);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
revert-fs-binfmt_elf-fix-pt_load-p_align-values-for-loaders.patch
revert-fs-binfmt_elf-use-pt_load-p_align-values-for-static-pie.patch
mm.patch
mm-create-new-mm-swaph-header-file-fix.patch
mm-shmem-make-shmem_init-return-void-fix.patch
mm-khugepaged-introduce-khugepaged_enter_vma-helper-vs-maple-tree.patch
ksm-count-ksm-merging-pages-for-each-process-fix.patch
mm-memory_hotplug-refactor-hotadd_init_pgdat-and-try_online_node-checkpatch-fixes.patch
proc-fix-dentry-inode-overinstantiating-under-proc-pid-net-checkpatch-fixes.patch
fs-proc-kcorec-remove-check-of-list-iterator-against-head-past-the-loop-body-fix.patch
add-fat-messages-to-printk-index-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch
mglru-vs-maple-tree.patch
