diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2018-04-27 17:13:20 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2018-04-27 17:13:20 -0600 |
| commit | ccf2b067948a8f90fc3d7990c57283e7e404d004 (patch) | |
| tree | 298e69b6f3e1eef45ac50ba68abe3dd175c4dc8c /mm/rmap.c | |
| parent | e27a20f104673f8ada70c5d32430a7f4c577fe95 (diff) | |
| parent | 6d08b06e67cd117f6992c46611dfb4ce267cd71e (diff) | |
| download | linux-ccf2b067948a8f90fc3d7990c57283e7e404d004.tar.bz2 | |
Merge tag 'v4.17-rc2' into docs-next
Merge -rc2 to pick up the changes to
Documentation/core-api/kernel-api.rst that hit mainline via the
networking tree. In their absence, subsequent patches cannot be
applied.
Diffstat (limited to 'mm/rmap.c')
| -rw-r--r-- | mm/rmap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 056213326651..6db729dc4c50 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1374,9 +1374,6 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma, if (!pvmw.pte && (flags & TTU_MIGRATION)) { VM_BUG_ON_PAGE(PageHuge(page) || !PageTransCompound(page), page); - if (!PageAnon(page)) - continue; - set_pmd_migration_entry(&pvmw, page); continue; } |