diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-05-11 16:56:38 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-11 16:56:38 +0200 |
commit | d2950158d0d7bc376503393ca5f73f6f8d27c56b (patch) | |
tree | 7daa04400d833bd722258a49d56a39acfb392520 /mm/memory.c | |
parent | ea7c28518943b26a85d73cd76acd03b71962cb18 (diff) | |
parent | e9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mm/memory.c b/mm/memory.c index 305537fc8640..52c218e2b724 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1222,15 +1222,8 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb, next = pmd_addr_end(addr, end); if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) { 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); } else if (zap_huge_pmd(tlb, vma, pmd, addr)) goto next; |