kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mm/memcg: kill mem_cgroup_lru_del()

Browse source 
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>
This commit is contained in:
Konstantin Khlebnikov 2012-05-29 15:06:54 -07:00 committed by Linus Torvalds
parent f3fd4a6192
commit bbf808ed7d
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/linux/memcontrol.h
View file

@ -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 *, struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *,
enum lru_list); enum lru_list);
void mem_cgroup_lru_del_list(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 *, struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *,
enum lru_list, enum lru_list); 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, static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone,
struct page *page, struct page *page,
enum lru_list from, enum lru_list from,

5
mm/memcontrol.c
View file

@ -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); 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 * mem_cgroup_lru_move_lists - account for moving a page between lrus
* @zone: zone of the page * @zone: zone of the page

2
mm/vmscan.c
View file

@ -1057,7 +1057,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
switch (__isolate_lru_page(page, mode)) { switch (__isolate_lru_page(page, mode)) {
case 0: case 0:
mem_cgroup_lru_del(page); mem_cgroup_lru_del_list(page, lru);
list_move(&page->lru, dst); list_move(&page->lru, dst);
nr_taken += hpage_nr_pages(page); nr_taken += hpage_nr_pages(page);
break; break;