diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-11 11:16:39 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-11 11:16:39 +0800 |
| commit | d83731cf53fd3af7173cab5e3f573d06ebc852be (patch) | |
| tree | d61002ed1d894fe2d9b26003a1230f05a61ed51b /mm/rmap.c | |
| parent | bfbd381ea0ca274e4c07ea62acaaeac31829cd5d (diff) | |
| parent | 017cfa86c2450b158d7d0336f2f3ea685da1230b (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.04-rt
Diffstat (limited to 'mm/rmap.c')
| -rw-r--r-- | mm/rmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 24dd3f9fee27..8fc556ce2dcb 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -30,6 +30,8 @@ * swap_lock (in swap_duplicate, swap_info_get) * mmlist_lock (in mmput, drain_mmlist and others) * mapping->private_lock (in __set_page_dirty_buffers) + * mem_cgroup_{begin,end}_page_stat (memcg->move_lock) + * mapping->tree_lock (widely used) * inode->i_lock (in set_page_dirty's __mark_inode_dirty) * bdi.wb->list_lock (in set_page_dirty's __mark_inode_dirty) * sb_lock (within inode_lock in fs/fs-writeback.c) |