> Reviewed-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> > > The preceding comment "they need to go on the active_anon lru below" > also needs update. > Thanks. incremental patch is here. --- include/linux/swap.h | 10 ---------- mm/filemap.c | 2 +- 2 files changed, 1 insertions(+), 11 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 18420a9..4bfd932 100644 --- a/include/linux/swap.h +++ b/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); -} - /* LRU Isolation modes. */ #define ISOLATE_INACTIVE 0 /* Isolate inactive pages. */ #define ISOLATE_ACTIVE 1 /* Isolate active pages. */ diff --git a/mm/filemap.c b/mm/filemap.c index 023ef61..a57931a 100644 --- a/mm/filemap.c +++ b/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)) -- 1.6.5.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>