diff options
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 5 |
1 files changed, 1 insertions, 4 deletions
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, | |||
1969 | unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, | 1969 | unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, |
1970 | gfp_t gfp_mask, bool noswap, | 1970 | gfp_t gfp_mask, bool noswap, |
1971 | unsigned int swappiness, | 1971 | unsigned int swappiness, |
1972 | struct zone *zone, int nid) | 1972 | struct zone *zone) |
1973 | { | 1973 | { |
1974 | struct scan_control sc = { | 1974 | struct scan_control sc = { |
1975 | .nr_to_reclaim = SWAP_CLUSTER_MAX, | 1975 | .nr_to_reclaim = SWAP_CLUSTER_MAX, |
@@ -1980,11 +1980,8 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem, | |||
1980 | .order = 0, | 1980 | .order = 0, |
1981 | .mem_cgroup = mem, | 1981 | .mem_cgroup = mem, |
1982 | }; | 1982 | }; |
1983 | nodemask_t nm = nodemask_of_node(nid); | ||
1984 | |||
1985 | sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) | | 1983 | sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) | |
1986 | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK); | 1984 | (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK); |
1987 | sc.nodemask = &nm; | ||
1988 | 1985 | ||
1989 | trace_mm_vmscan_memcg_softlimit_reclaim_begin(0, | 1986 | trace_mm_vmscan_memcg_softlimit_reclaim_begin(0, |
1990 | sc.may_writepage, | 1987 | sc.may_writepage, |