From: Andrew Morton Use the local Cc: Nick Piggin Cc: Lee Schermerhorn Cc: Rik van Riel Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton --- mm/mlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/mlock.c~mmap-handle-mlocked-pages-during-map-remap-unmap-cleanup mm/mlock.c --- a/mm/mlock.c~mmap-handle-mlocked-pages-during-map-remap-unmap-cleanup +++ a/mm/mlock.c @@ -274,7 +274,7 @@ static void __munlock_vma_pages_range(st }; VM_BUG_ON(start & ~PAGE_MASK || end & ~PAGE_MASK); - VM_BUG_ON((!rwsem_is_locked(&vma->vm_mm->mmap_sem)) && + VM_BUG_ON((!rwsem_is_locked(&mm->mmap_sem)) && (atomic_read(&mm->mm_users) != 0)); VM_BUG_ON(start < vma->vm_start); VM_BUG_ON(end > vma->vm_end); _