p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

swap: remove unused mem_cgroup_uncharge_swapcache declaration 

The body of this function was removed by commit 0a31bc97c8 ("mm:
memcontrol: rewrite uncharge API").

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Vladimir Davydov 2015-02-11 15:24:59 -08:00 committed by Linus Torvalds
parent 83363b917a
commit 93aa7d9524
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/swap.h
View File

@ -437,16 +437,6 @@ extern int reuse_swap_page(struct page *);
extern int try_to_free_swap(struct page *); extern int try_to_free_swap(struct page *);
struct backing_dev_info; struct backing_dev_info;
#ifdef CONFIG_MEMCG
extern void
mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout);
#else
static inline void
mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
{
}
#endif
#else /* CONFIG_SWAP */ #else /* CONFIG_SWAP */
#define swap_address_space(entry) (NULL) #define swap_address_space(entry) (NULL)
@ -547,11 +537,6 @@ static inline swp_entry_t get_swap_page(void)
return entry; return entry;
} }
static inline void
mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
{
}
#endif /* CONFIG_SWAP */ #endif /* CONFIG_SWAP */
#endif /* __KERNEL__*/ #endif /* __KERNEL__*/
#endif /* _LINUX_SWAP_H */ #endif /* _LINUX_SWAP_H */

2
mm/shmem.c
View File

@ -1131,7 +1131,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
* truncated or holepunched since swap was confirmed. * truncated or holepunched since swap was confirmed.
* shmem_undo_range() will have done some of the * shmem_undo_range() will have done some of the
* unaccounting, now delete_from_swap_cache() will do * unaccounting, now delete_from_swap_cache() will do
* the rest (including mem_cgroup_uncharge_swapcache). * the rest.
* Reset swap.val? No, leave it so "failed" goes back to * Reset swap.val? No, leave it so "failed" goes back to
* "repeat": reading a hole and writing should succeed. * "repeat": reading a hole and writing should succeed.
*/ */