thp: fix memory-failure hugetlbfs vs THP collision

[karo-tx-linux.git] / mm / rmap.c

diff --git a/mm/rmap.c b/mm/rmap.c
index 3825ae4bc32f971be5c2c3536f145f200036a0f0..c30f33854f9751ff27dac942bbcdbbdfb30bd200 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1430,7 +1430,7 @@ int try_to_unmap(struct page *page, enum ttu_flags flags)
        int ret;
 
        BUG_ON(!PageLocked(page));
-       BUG_ON(PageTransHuge(page));
+       VM_BUG_ON(!PageHuge(page) && PageTransHuge(page));
 
        if (unlikely(PageKsm(page)))
                ret = try_to_unmap_ksm(page, flags);