thp: fix memory-failure hugetlbfs vs THP collision

[deliverable/linux.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 6a283cc9317c52053e16a2bcf8ebaabb23634ad8..1b43d0ffff6523626d04253afa66d32c6781df92 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -386,7 +386,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,
        struct task_struct *tsk;
        struct anon_vma *av;
 
-       if (unlikely(split_huge_page(page)))
+       if (!PageHuge(page) && unlikely(split_huge_page(page)))
                return;
        read_lock(&tasklist_lock);
        av = page_lock_anon_vma(page);