From b00db001f8356f128bf49ffa188efdab9c7043d7 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Wed, 21 Mar 2012 16:34:09 -0700
Subject: [PATCH] --- yaml --- r: 292655 b: refs/heads/master c:
 9a3c531df9462df6cc2b060f749651723ffc180c h: refs/heads/master i:   292653:
 ca15e1f3854793a9e27ecbbf481704fa7eb427ff   292651:
 1b96955f48ea0670a0390f4b6fc2618c9bf010be   292647:
 cc641f6fe083618a05d6a1758d8e319c5a78b769   292639:
 4e9062d481c7909b119d8184dee10e4e6e6139c6 v: v3

---
 [refs]             | 2 +-
 trunk/mm/filemap.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7a0dfab88917..5718f7a66a8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47a133339c332f9f8e155c70f5da401aded69948
+refs/heads/master: 9a3c531df9462df6cc2b060f749651723ffc180c
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index e8cf8aefd6f6..f3230604006c 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -101,9 +101,8 @@
  *    ->inode->i_lock		(zap_pte_range->set_page_dirty)
  *    ->private_lock		(zap_pte_range->__set_page_dirty_buffers)
  *
- *  (code doesn't rely on that order, so you could switch it around)
- *  ->tasklist_lock             (memory_failure, collect_procs_ao)
- *    ->i_mmap_mutex
+ * ->i_mmap_mutex
+ *   ->tasklist_lock            (memory_failure, collect_procs_ao)
  */
 
 /*