diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memcontrol.c | 3 | ||||
| -rw-r--r-- | mm/vmscan.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a1c3c317a4dd..8d0bfd7fe328 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1300,8 +1300,7 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem, /* we use swappiness of local cgroup */ if (check_soft) ret = mem_cgroup_shrink_node_zone(victim, gfp_mask, - noswap, get_swappiness(victim), zone, - zone->zone_pgdat->node_id); + noswap, get_swappiness(victim), zone); else ret = try_to_free_mem_cgroup_pages(victim, gfp_mask, noswap, get_swappiness(victim)); diff --git a/mm/vmscan.c b/mm/vmscan.c index 291270496b6f..06ccda66dec0 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1969,7 +1969,7 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order, unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, gfp_t gfp_mask, bool noswap, unsigned int swappiness, - struct zone *zone, int nid) + struct zone *zone) { struct scan_control sc = { .nr_to_reclaim = SWAP_CLUSTER_MAX, @@ -1980,11 +1980,8 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, .order = 0, .mem_cgroup = mem, }; - nodemask_t nm = nodemask_of_node(nid); - sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK); - sc.nodemask = &nm; trace_mm_vmscan_memcg_softlimit_reclaim_begin(0, sc.may_writepage, |