diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-21 13:26:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-21 13:26:54 -0700 |
| commit | 18bf34080c4c3beb6699181986cc97dd712498fe (patch) | |
| tree | 39df6f8fcf54a39edc15aeee48cc266fbc07cbe7 /mm/ksm.c | |
| parent | 8160a563cfff2a94e4ef20508961f1c9eead3b1f (diff) | |
| parent | cf01699ee220c38099eb3e43ce3d10690c8b7060 (diff) | |
Merge branch 'akpm' (patches from Andrew)HEADmasterbisect-ftrace
Merge misc fixes from Andrew Morton:
"15 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
tools/vm: fix cross-compile build
coredump: fix null pointer dereference on coredump
mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path
shmem: fix possible deadlocks on shmlock_user_lock
vmalloc: fix remap_vmalloc_range() bounds checks
mm/shmem: fix build without THP
mm/ksm: fix NULL pointer dereference when KSM zero page is enabled
tools/build: tweak unused value workaround
checkpatch: fix a typo in the regex for $allocFunctions
mm, gup: return EINTR when gup is interrupted by fatal signals
mm/hugetlb: fix a addressing exception caused by huge_pte_offset
MAINTAINERS: add an entry for kfifo
mm/userfaultfd: disable userfaultfd-wp on x86_32
slub: avoid redzone when choosing freepointer location
sh: fix build error in mm/init.c
Diffstat (limited to 'mm/ksm.c')
| -rw-r--r-- | mm/ksm.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mm/ksm.c b/mm/ksm.c index a558da9e71770..281c00129a2ea 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2112,8 +2112,16 @@ static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item) down_read(&mm->mmap_sem); vma = find_mergeable_vma(mm, rmap_item->address); - err = try_to_merge_one_page(vma, page, - ZERO_PAGE(rmap_item->address)); + if (vma) { + err = try_to_merge_one_page(vma, page, + ZERO_PAGE(rmap_item->address)); + } else { + /* + * If the vma is out of date, we do not need to + * continue. + */ + err = 0; + } up_read(&mm->mmap_sem); /* * In case of failure, the page was not really empty, so we |