|
@@ -1417,11 +1417,9 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb,
|
|
do {
|
|
do {
|
|
next = pmd_addr_end(addr, end);
|
|
next = pmd_addr_end(addr, end);
|
|
if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
|
|
if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
|
|
- if (next - addr != HPAGE_PMD_SIZE) {
|
|
|
|
- VM_BUG_ON_VMA(vma_is_anonymous(vma) &&
|
|
|
|
- !rwsem_is_locked(&tlb->mm->mmap_sem), vma);
|
|
|
|
|
|
+ if (next - addr != HPAGE_PMD_SIZE)
|
|
__split_huge_pmd(vma, pmd, addr, false, NULL);
|
|
__split_huge_pmd(vma, pmd, addr, false, NULL);
|
|
- } else if (zap_huge_pmd(tlb, vma, pmd, addr))
|
|
|
|
|
|
+ else if (zap_huge_pmd(tlb, vma, pmd, addr))
|
|
goto next;
|
|
goto next;
|
|
/* fall through */
|
|
/* fall through */
|
|
}
|
|
}
|