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 a7198c065999..df542feaac3b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1990,7 +1990,7 @@ zonelist_scan: | |||
1990 | 1990 | ||
1991 | /* | 1991 | /* |
1992 | * Scan zonelist, looking for a zone with enough free. | 1992 | * Scan zonelist, looking for a zone with enough free. |
1993 | * See also __cpuset_node_allowed_softwall() comment in kernel/cpuset.c. | 1993 | * See also __cpuset_node_allowed() comment in kernel/cpuset.c. |
1994 | */ | 1994 | */ |
1995 | for_each_zone_zonelist_nodemask(zone, z, zonelist, | 1995 | for_each_zone_zonelist_nodemask(zone, z, zonelist, |
1996 | high_zoneidx, nodemask) { | 1996 | high_zoneidx, nodemask) { |
@@ -2001,7 +2001,7 @@ zonelist_scan: | |||
2001 | continue; | 2001 | continue; |
2002 | if (cpusets_enabled() && | 2002 | if (cpusets_enabled() && |
2003 | (alloc_flags & ALLOC_CPUSET) && | 2003 | (alloc_flags & ALLOC_CPUSET) && |
2004 | !cpuset_zone_allowed_softwall(zone, gfp_mask)) | 2004 | !cpuset_zone_allowed(zone, gfp_mask)) |
2005 | continue; | 2005 | continue; |
2006 | /* | 2006 | /* |
2007 | * Distribute pages in proportion to the individual | 2007 | * Distribute pages in proportion to the individual |
@@ -2529,7 +2529,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask) | |||
2529 | alloc_flags |= ALLOC_HARDER; | 2529 | alloc_flags |= ALLOC_HARDER; |
2530 | /* | 2530 | /* |
2531 | * Ignore cpuset mems for GFP_ATOMIC rather than fail, see the | 2531 | * Ignore cpuset mems for GFP_ATOMIC rather than fail, see the |
2532 | * comment for __cpuset_node_allowed_softwall(). | 2532 | * comment for __cpuset_node_allowed(). |
2533 | */ | 2533 | */ |
2534 | alloc_flags &= ~ALLOC_CPUSET; | 2534 | alloc_flags &= ~ALLOC_CPUSET; |
2535 | } else if (unlikely(rt_task(current)) && !in_interrupt()) | 2535 | } else if (unlikely(rt_task(current)) && !in_interrupt()) |