The patch titled mm: comment mmap_sem / lock_page lockorder has been added to the -mm tree. Its filename is mm-comment-mmap_sem--lock_page-lockorder.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: mm: comment mmap_sem / lock_page lockorder From: Nick Piggin <npiggin@xxxxxxx> Add a few more examples to the mmap_sem / lock_page ordering. Signed-off-by: Nick Piggin <npiggin@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- mm/filemap.c | 2 +- mm/rmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN mm/filemap.c~mm-comment-mmap_sem--lock_page-lockorder mm/filemap.c --- a/mm/filemap.c~mm-comment-mmap_sem--lock_page-lockorder +++ a/mm/filemap.c @@ -73,7 +73,7 @@ generic_file_direct_IO(int rw, struct ki * ->mapping->tree_lock (arch-dependent flush_dcache_mmap_lock) * * ->mmap_sem - * ->lock_page (access_process_vm) + * ->lock_page (page fault, sys_mmap, access_process_vm) * * ->mmap_sem * ->i_mutex (msync) diff -puN mm/rmap.c~mm-comment-mmap_sem--lock_page-lockorder mm/rmap.c --- a/mm/rmap.c~mm-comment-mmap_sem--lock_page-lockorder +++ a/mm/rmap.c @@ -29,7 +29,7 @@ * taken together; in truncation, i_mutex is taken outermost. * * mm->mmap_sem - * page->flags PG_locked (lock_page) + * page->flags PG_locked (lock_page, eg from pagefault) * mapping->i_mmap_lock * anon_vma->lock * mm->page_table_lock or pte_lock _ Patches currently in -mm which might be from npiggin@xxxxxxx are mm-comment-mmap_sem--lock_page-lockorder.patch mm-pagecache-write-deadlocks.patch oom-dont-kill-unkillable-children-or-siblings.patch oom-cleanup-messages.patch oom-less-memdie.patch mm-incorrect-vm_fault_oom-returns-from-drivers.patch mm-add-arch_alloc_page.patch radix-tree-rcu-lockless-readside.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html