diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:20:42 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:20:42 -0500 |
commit | 2af5920b81a4cd0a22d40b6b2c38356d3df03e13 (patch) | |
tree | 7ee66d514e394f70f12a608548487353d506215d /mm/filemap.c | |
parent | 000080c3499cd5037e60c08a8053efb9e48aa9c0 (diff) | |
parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) |
Merge branch 'master'
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index a965b6b35f26..44da3d476994 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -94,6 +94,7 @@ generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, * ->private_lock (try_to_unmap_one) * ->tree_lock (try_to_unmap_one) * ->zone.lru_lock (follow_page->mark_page_accessed) + * ->zone.lru_lock (check_pte_range->isolate_lru_page) * ->private_lock (page_remove_rmap->set_page_dirty) * ->tree_lock (page_remove_rmap->set_page_dirty) * ->inode_lock (page_remove_rmap->set_page_dirty) |