diff options
-rw-r--r-- | include/linux/memcontrol.h | 5 | ||||
-rw-r--r-- | mm/memcontrol.c | 5 | ||||
-rw-r--r-- | mm/vmscan.c | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index cfe9050ad8da..e3fc200cd68e 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -66,7 +66,6 @@ struct lruvec *mem_cgroup_zone_lruvec(struct zone *, struct mem_cgroup *); | |||
66 | struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *, | 66 | struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *, |
67 | enum lru_list); | 67 | enum lru_list); |
68 | void mem_cgroup_lru_del_list(struct page *, enum lru_list); | 68 | void mem_cgroup_lru_del_list(struct page *, enum lru_list); |
69 | void mem_cgroup_lru_del(struct page *); | ||
70 | struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *, | 69 | struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *, |
71 | enum lru_list, enum lru_list); | 70 | enum lru_list, enum lru_list); |
72 | 71 | ||
@@ -265,10 +264,6 @@ static inline void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru) | |||
265 | { | 264 | { |
266 | } | 265 | } |
267 | 266 | ||
268 | static inline void mem_cgroup_lru_del(struct page *page) | ||
269 | { | ||
270 | } | ||
271 | |||
272 | static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone, | 267 | static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone, |
273 | struct page *page, | 268 | struct page *page, |
274 | enum lru_list from, | 269 | enum lru_list from, |
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; |