thp: allow mlocked THP again

[mirror_ubuntu-artful-kernel.git] / mm / rmap.c

diff --git a/mm/rmap.c b/mm/rmap.c
index 84271cc39d1ea816ca9bfa567f2d305f000a054c..31d8866fb5629cb35033ac414b7a95625c688722 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1282,6 +1282,9 @@ static void page_remove_anon_compound_rmap(struct page *page)
                nr = HPAGE_PMD_NR;
        }
 
+       if (unlikely(PageMlocked(page)))
+               clear_page_mlock(page);
+
        if (nr) {
                __mod_zone_page_state(page_zone(page), NR_ANON_PAGES, -nr);
                deferred_split_huge_page(page);