aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 01c2d8f14685..4a747a27a22f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1488,8 +1488,9 @@ void mem_cgroup_uncharge_cache_page(struct page *page)
1488 __mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_CACHE); 1488 __mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_CACHE);
1489} 1489}
1490 1490
1491#ifdef CONFIG_SWAP
1491/* 1492/*
1492 * called from __delete_from_swap_cache() and drop "page" account. 1493 * called after __delete_from_swap_cache() and drop "page" account.
1493 * memcg information is recorded to swap_cgroup of "ent" 1494 * memcg information is recorded to swap_cgroup of "ent"
1494 */ 1495 */
1495void mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent) 1496void mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
@@ -1506,6 +1507,7 @@ void mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent)
1506 if (memcg) 1507 if (memcg)
1507 css_put(&memcg->css); 1508 css_put(&memcg->css);
1508} 1509}
1510#endif
1509 1511
1510#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP 1512#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
1511/* 1513/*