X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Foom_kill.c;h=b278b8d60eee4ac13bba50222c478901cff39a60;hb=92e1d5be91a0e3ffa5c4697eeb09b2aa22792122;hp=223d9ccb7d64b6b28f5642ba3ab12629a170419a;hpb=21b4e736922f546e0f1aa7b9d6c442f309a2444a;p=linux-2.6

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 223d9ccb7d..b278b8d60e 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -60,12 +60,6 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
 		return 0;
 	}
 
-	/*
-	 * swapoff can easily use up all memory, so kill those first.
-	 */
-	if (p->flags & PF_SWAPOFF)
-		return ULONG_MAX;
-
 	/*
 	 * The memory size of the process is the basis for the badness.
 	 */
@@ -76,6 +70,12 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
 	 */
 	task_unlock(p);
 
+	/*
+	 * swapoff can easily use up all memory, so kill those first.
+	 */
+	if (p->flags & PF_SWAPOFF)
+		return ULONG_MAX;
+
 	/*
 	 * Processes which fork a lot of child processes are likely
 	 * a good choice. We add half the vmsize of the children if they
@@ -174,10 +174,15 @@ static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask)
 {
 #ifdef CONFIG_NUMA
 	struct zone **z;
-	nodemask_t nodes = node_online_map;
+	nodemask_t nodes;
+	int node;
+	/* node has memory ? */
+	for_each_online_node(node)
+		if (NODE_DATA(node)->node_present_pages)
+			node_set(node, nodes);
 
 	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;