|
@@ -1222,15 +1222,8 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb,
|
|
next = pmd_addr_end(addr, end);
|
|
next = pmd_addr_end(addr, end);
|
|
if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
|
|
if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
|
|
if (next - addr != HPAGE_PMD_SIZE) {
|
|
if (next - addr != HPAGE_PMD_SIZE) {
|
|
-#ifdef CONFIG_DEBUG_VM
|
|
|
|
- if (!rwsem_is_locked(&tlb->mm->mmap_sem)) {
|
|
|
|
- pr_err("%s: mmap_sem is unlocked! addr=0x%lx end=0x%lx vma->vm_start=0x%lx vma->vm_end=0x%lx\n",
|
|
|
|
- __func__, addr, end,
|
|
|
|
- vma->vm_start,
|
|
|
|
- vma->vm_end);
|
|
|
|
- BUG();
|
|
|
|
- }
|
|
|
|
-#endif
|
|
|
|
|
|
+ VM_BUG_ON_VMA(vma_is_anonymous(vma) &&
|
|
|
|
+ !rwsem_is_locked(&tlb->mm->mmap_sem), vma);
|
|
split_huge_pmd(vma, pmd, addr);
|
|
split_huge_pmd(vma, pmd, addr);
|
|
} else if (zap_huge_pmd(tlb, vma, pmd, addr))
|
|
} else if (zap_huge_pmd(tlb, vma, pmd, addr))
|
|
goto next;
|
|
goto next;
|