Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux...

[net-next-2.6.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index bcc7372aebbc4375d0763e4f3acd8d096bcb612d..c1fc205a92c6eae9840961ad34dbfc88b58a80a4 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -104,6 +104,10 @@
  *
  *  ->task->proc_lock
  *    ->dcache_lock            (proc_pid_lookup)
+ *
+ *  (code doesn't rely on that order, so you could switch it around)
+ *  ->tasklist_lock             (memory_failure, collect_procs_ao)
+ *    ->i_mmap_lock
  */
 
 /*