aboutsummaryrefslogtreecommitdiffstats
path: root/mm/vmscan.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r--mm/vmscan.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index c7ce2c161225..c5ef7240cbcb 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -580,8 +580,8 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,
580 struct mem_cgroup *memcg, int priority) 580 struct mem_cgroup *memcg, int priority)
581{ 581{
582 struct memcg_shrinker_map *map; 582 struct memcg_shrinker_map *map;
583 unsigned long freed = 0; 583 unsigned long ret, freed = 0;
584 int ret, i; 584 int i;
585 585
586 if (!memcg_kmem_enabled() || !mem_cgroup_online(memcg)) 586 if (!memcg_kmem_enabled() || !mem_cgroup_online(memcg))
587 return 0; 587 return 0;
@@ -677,9 +677,8 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
677 struct mem_cgroup *memcg, 677 struct mem_cgroup *memcg,
678 int priority) 678 int priority)
679{ 679{
680 unsigned long ret, freed = 0;
680 struct shrinker *shrinker; 681 struct shrinker *shrinker;
681 unsigned long freed = 0;
682 int ret;
683 682
684 if (!mem_cgroup_is_root(memcg)) 683 if (!mem_cgroup_is_root(memcg))
685 return shrink_slab_memcg(gfp_mask, nid, memcg, priority); 684 return shrink_slab_memcg(gfp_mask, nid, memcg, priority);