diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9cd36b822444..ab07b496672f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1962,7 +1962,7 @@ zonelist_scan: | |||
1962 | 1962 | ||
1963 | /* | 1963 | /* |
1964 | * Scan zonelist, looking for a zone with enough free. | 1964 | * Scan zonelist, looking for a zone with enough free. |
1965 | * See also __cpuset_node_allowed_softwall() comment in kernel/cpuset.c. | 1965 | * See also __cpuset_node_allowed() comment in kernel/cpuset.c. |
1966 | */ | 1966 | */ |
1967 | for_each_zone_zonelist_nodemask(zone, z, zonelist, | 1967 | for_each_zone_zonelist_nodemask(zone, z, zonelist, |
1968 | high_zoneidx, nodemask) { | 1968 | high_zoneidx, nodemask) { |
@@ -1973,7 +1973,7 @@ zonelist_scan: | |||
1973 | continue; | 1973 | continue; |
1974 | if (cpusets_enabled() && | 1974 | if (cpusets_enabled() && |
1975 | (alloc_flags & ALLOC_CPUSET) && | 1975 | (alloc_flags & ALLOC_CPUSET) && |
1976 | !cpuset_zone_allowed_softwall(zone, gfp_mask)) | 1976 | !cpuset_zone_allowed(zone, gfp_mask)) |
1977 | continue; | 1977 | continue; |
1978 | /* | 1978 | /* |
1979 | * Distribute pages in proportion to the individual | 1979 | * Distribute pages in proportion to the individual |
@@ -2514,7 +2514,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask) | |||
2514 | alloc_flags |= ALLOC_HARDER; | 2514 | alloc_flags |= ALLOC_HARDER; |
2515 | /* | 2515 | /* |
2516 | * Ignore cpuset mems for GFP_ATOMIC rather than fail, see the | 2516 | * Ignore cpuset mems for GFP_ATOMIC rather than fail, see the |
2517 | * comment for __cpuset_node_allowed_softwall(). | 2517 | * comment for __cpuset_node_allowed(). |
2518 | */ | 2518 | */ |
2519 | alloc_flags &= ~ALLOC_CPUSET; | 2519 | alloc_flags &= ~ALLOC_CPUSET; |
2520 | } else if (unlikely(rt_task(current)) && !in_interrupt()) | 2520 | } else if (unlikely(rt_task(current)) && !in_interrupt()) |