Pull button into test branch

[~andy/linux] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 223d9ccb7d64b6b28f5642ba3ab12629a170419a..64cf3c2146348b0e1cba3fd98d64354bcb466c4a 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -177,7 +177,7 @@ static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask)
        nodemask_t nodes = node_online_map;
 
        for (z = zonelist->zones; *z; z++)
-               if (cpuset_zone_allowed(*z, gfp_mask))
+               if (cpuset_zone_allowed_softwall(*z, gfp_mask))
                        node_clear(zone_to_nid(*z), nodes);
                else
                        return CONSTRAINT_CPUSET;