X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fswapfile.c;h=2015a1e42dc0f1d17fc2a43a1b3af06c82e66b86;hb=4f75fb8504bd41f9fbb455188b3e75f8d248737e;hp=b1cd120607230b0770c35e0823d6389782ae734a;hpb=f8f5ed7c996ad9426847ce09b828d415cb19bc06;p=pandora-kernel.git

diff --git a/mm/swapfile.c b/mm/swapfile.c
index b1cd12060723..2015a1e42dc0 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -931,9 +931,7 @@ static inline int unuse_pmd_range(struct vm_area_struct *vma, pud_t *pud,
 	pmd = pmd_offset(pud, addr);
 	do {
 		next = pmd_addr_end(addr, end);
-		if (unlikely(pmd_trans_huge(*pmd)))
-			continue;
-		if (pmd_none_or_clear_bad(pmd))
+		if (pmd_none_or_trans_huge_or_clear_bad(pmd))
 			continue;
 		ret = unuse_pte_range(vma, pmd, addr, next, entry, page);
 		if (ret)