From c0f26146ec816bb8f5085a52fe7a0a9081ef731b Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date: Tue, 29 May 2012 15:06:54 -0700
Subject: [PATCH] --- yaml --- r: 308899 b: refs/heads/master c:
 bbf808ed7de68fdf626fd4f9718d88cf03ce13a9 h: refs/heads/master i:   308897:
 71b385caa8294cd785aaa0521d8a713a19396406   308895:
 6050aa005cecbf038ae3e7e4e31b30e8b6f96758 v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/memcontrol.h | 5 -----
 trunk/mm/memcontrol.c            | 5 -----
 trunk/mm/vmscan.c                | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 145382eb1e6b..80c40aef48a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3fd4a61928a5edf5b033a417e761b488b43e203
+refs/heads/master: bbf808ed7de68fdf626fd4f9718d88cf03ce13a9
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index cfe9050ad8da..e3fc200cd68e 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/include/linux/memcontrol.h
@@ -66,7 +66,6 @@ struct lruvec *mem_cgroup_zone_lruvec(struct zone *, struct mem_cgroup *);
 struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *,
 				       enum lru_list);
 void mem_cgroup_lru_del_list(struct page *, enum lru_list);
-void mem_cgroup_lru_del(struct page *);
 struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *,
 					 enum lru_list, enum lru_list);
 
@@ -265,10 +264,6 @@ static inline void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru)
 {
 }
 
-static inline void mem_cgroup_lru_del(struct page *page)
-{
-}
-
 static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone,
 						       struct page *page,
 						       enum lru_list from,
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 00c8898dbb81..75f23e98db43 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -1115,11 +1115,6 @@ void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru)
 	mz->lru_size[lru] -= 1 << compound_order(page);
 }
 
-void mem_cgroup_lru_del(struct page *page)
-{
-	mem_cgroup_lru_del_list(page, page_lru(page));
-}
-
 /**
  * mem_cgroup_lru_move_lists - account for moving a page between lrus
  * @zone: zone of the page
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 27ef5769b9e4..c94d17d75d73 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -1057,7 +1057,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
 
 		switch (__isolate_lru_page(page, mode)) {
 		case 0:
-			mem_cgroup_lru_del(page);
+			mem_cgroup_lru_del_list(page, lru);
 			list_move(&page->lru, dst);
 			nr_taken += hpage_nr_pages(page);
 			break;