From 9108461dbf249d1b28e502fc25b42f7176ceb46e Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Mon, 24 May 2010 14:31:48 -0700 Subject: [PATCH] --- yaml --- r: 198216 b: refs/heads/master c: e9d6c157385e4efa61cb8293e425c9d8beba70d3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/swap.h | 10 ---------- trunk/mm/filemap.c | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 31758d7bbac9..b64ed0a9230e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f0a738868cbfe20ae53a00b7c302c04ef7ab8fc +refs/heads/master: e9d6c157385e4efa61cb8293e425c9d8beba70d3 diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h index ec2b7a42b45f..600b03b7732e 100644 --- a/trunk/include/linux/swap.h +++ b/trunk/include/linux/swap.h @@ -224,21 +224,11 @@ static inline void lru_cache_add_anon(struct page *page) __lru_cache_add(page, LRU_INACTIVE_ANON); } -static inline void lru_cache_add_active_anon(struct page *page) -{ - __lru_cache_add(page, LRU_ACTIVE_ANON); -} - static inline void lru_cache_add_file(struct page *page) { __lru_cache_add(page, LRU_INACTIVE_FILE); } -static inline void lru_cache_add_active_file(struct page *page) -{ - __lru_cache_add(page, LRU_ACTIVE_FILE); -} - /* linux/mm/vmscan.c */ extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order, gfp_t gfp_mask, nodemask_t *mask); diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 140ebda9640f..d6f4f073836e 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -441,7 +441,7 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping, /* * Splice_read and readahead add shmem/tmpfs pages into the page cache * before shmem_readpage has a chance to mark them as SwapBacked: they - * need to go on the active_anon lru below, and mem_cgroup_cache_charge + * need to go on the anon lru below, and mem_cgroup_cache_charge * (called in add_to_page_cache) needs to know where they're going too. */ if (mapping_cap_swap_backed(mapping)) @@ -452,7 +452,7 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping, if (page_is_file_cache(page)) lru_cache_add_file(page); else - lru_cache_add_active_anon(page); + lru_cache_add_anon(page); } return ret; }