diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-10 17:23:41 -0500 |
| commit | 274353674dd0337bdeeaee08a9f2047777b07ab0 (patch) | |
| tree | b788d77dd7c0e8f27bbcc89fc742c212c28872c0 /mm/filemap.c | |
| parent | 1740d483ba4d79f9fa6984dccd7152b6b208f1bf (diff) | |
| parent | d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f (diff) | |
Merge branch 'ehci-omap-clock' into omap-fixes
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 6b9aee20f242..ca389394fa2a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -102,9 +102,6 @@ | |||
| 102 | * ->inode_lock (zap_pte_range->set_page_dirty) | 102 | * ->inode_lock (zap_pte_range->set_page_dirty) |
| 103 | * ->private_lock (zap_pte_range->__set_page_dirty_buffers) | 103 | * ->private_lock (zap_pte_range->__set_page_dirty_buffers) |
| 104 | * | 104 | * |
| 105 | * ->task->proc_lock | ||
| 106 | * ->dcache_lock (proc_pid_lookup) | ||
| 107 | * | ||
| 108 | * (code doesn't rely on that order, so you could switch it around) | 105 | * (code doesn't rely on that order, so you could switch it around) |
| 109 | * ->tasklist_lock (memory_failure, collect_procs_ao) | 106 | * ->tasklist_lock (memory_failure, collect_procs_ao) |
| 110 | * ->i_mmap_lock | 107 | * ->i_mmap_lock |