diff options
author | Konstantin Khlebnikov <khlebnikov@openvz.org> | 2012-05-29 18:06:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-29 19:22:25 -0400 |
commit | bbf808ed7de68fdf626fd4f9718d88cf03ce13a9 (patch) | |
tree | 91f3dc3eb619f2b809cdd9c1239a6db0e62c97ed /mm | |
parent | f3fd4a61928a5edf5b033a417e761b488b43e203 (diff) |
mm/memcg: kill mem_cgroup_lru_del()
This patch kills mem_cgroup_lru_del(), we can use
mem_cgroup_lru_del_list() instead. On 0-order isolation we already have
right lru list id.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Glauber Costa <glommer@parallels.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memcontrol.c | 5 | ||||
-rw-r--r-- | mm/vmscan.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 00c8898dbb81..75f23e98db43 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -1115,11 +1115,6 @@ void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru) | |||
1115 | mz->lru_size[lru] -= 1 << compound_order(page); | 1115 | mz->lru_size[lru] -= 1 << compound_order(page); |
1116 | } | 1116 | } |
1117 | 1117 | ||
1118 | void mem_cgroup_lru_del(struct page *page) | ||
1119 | { | ||
1120 | mem_cgroup_lru_del_list(page, page_lru(page)); | ||
1121 | } | ||
1122 | |||
1123 | /** | 1118 | /** |
1124 | * mem_cgroup_lru_move_lists - account for moving a page between lrus | 1119 | * mem_cgroup_lru_move_lists - account for moving a page between lrus |
1125 | * @zone: zone of the page | 1120 | * @zone: zone of the page |
diff --git a/mm/vmscan.c b/mm/vmscan.c index 27ef5769b9e4..c94d17d75d73 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1057,7 +1057,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, | |||
1057 | 1057 | ||
1058 | switch (__isolate_lru_page(page, mode)) { | 1058 | switch (__isolate_lru_page(page, mode)) { |
1059 | case 0: | 1059 | case 0: |
1060 | mem_cgroup_lru_del(page); | 1060 | mem_cgroup_lru_del_list(page, lru); |
1061 | list_move(&page->lru, dst); | 1061 | list_move(&page->lru, dst); |
1062 | nr_taken += hpage_nr_pages(page); | 1062 | nr_taken += hpage_nr_pages(page); |
1063 | break; | 1063 | break; |