summaryrefslogtreecommitdiff
path: root/mm/rmap.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2011-06-28 03:18:09 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-28 05:00:13 +0400
commit9b679320a5fbf46454011e5c62e0b8991b0956d1 (patch)
tree49ea7be5e8bb669ef99533a18c73555e2882efc5 /mm/rmap.c
parentaa2c96d6f329e66cc59352b0f12e8f04e6a9593b (diff)
downloadlinux-9b679320a5fbf46454011e5c62e0b8991b0956d1.tar.xz
mm/memory-failure.c: fix spinlock vs mutex order
We cannot take a mutex while holding a spinlock, so flip the order and fix the locking documentation. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/rmap.c')
-rw-r--r--mm/rmap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index 27dfd3b82b0f..23295f65ae43 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -38,9 +38,8 @@
* in arch-dependent flush_dcache_mmap_lock,
* within inode_wb_list_lock in __sync_single_inode)
*
- * (code doesn't rely on that order so it could be switched around)
- * ->tasklist_lock
- * anon_vma->mutex (memory_failure, collect_procs_anon)
+ * anon_vma->mutex,mapping->i_mutex (memory_failure, collect_procs_anon)
+ * ->tasklist_lock
* pte map lock
*/