Merge branch 'akpm'

* akpm:
  mm: madvise(MADV_DODUMP): allow hugetlbfs pages
  ocfs2: fix locking for res->tracking and dlm->tracking_list
  mm/vmscan.c: fix int overflow in callers of do_shrink_slab()
  mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly
  mm/vmstat.c: fix outdated vmstat_text
  proc: restrict kernel stack dumps to root
  mm/hugetlb: add mmap() encodings for 32MB and 512MB page sizes
  mm/migrate.c: split only transparent huge pages when allocation fails
  ipc/shm.c: use ERR_CAST() for shm_lock() error return
  mm/gup_benchmark: fix unsigned comparison to zero in __gup_benchmark_ioctl
  mm, thp: fix mlocking THP page with migration enabled
  ocfs2: fix crash in ocfs2_duplicate_clusters_by_page()
  hugetlb: take PMD sharing into account when flushing tlb/caches
  mm: migration: fix migration of huge PMD shared pages

1 files changed, 4 insertions, 1 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index 5e285c1249a0..84381b55b2bd 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -275,6 +275,9 @@ static bool remove_migration_pte(struct page *page, struct vm_area_struct *vma,
                 if (vma->vm_flags & VM_LOCKED && !PageTransCompound(new))
                         mlock_vma_page(new);
 
+                if (PageTransHuge(page) && PageMlocked(page))
+                        clear_page_mlock(page);
+
                 /* No need to invalidate - it was non-present before */
                 update_mmu_cache(vma, pvmw.address, pvmw.pte);
         }
@@ -1411,7 +1414,7 @@ retry:
                                  * we encounter them after the rest of the list
                                  * is processed.
                                  */
-                                if (PageTransHuge(page)) {
+                                if (PageTransHuge(page) && !PageHuge(page)) {
                                         lock_page(page);
                                         rc = split_huge_page_to_list(page, from);
                                         unlock_page(page);