---

yaml --- r: 35605 b: refs/heads/master c: af5b912 h: refs/heads/master i: 35603: 5b128f2 v: v3
git-mirror · Sep 26, 2006 · fd58a72 · fd58a72
1 parent ffa78a1
commit fd58a72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a3ede107e422a0c53d28024b0aa902ca22a8768
+refs/heads/master: af5b912435de32fbede08cee949429823ed49781
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -59,6 +59,12 @@ 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.
 	 */
@@ -230,8 +236,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
 		}
 		if (p->oomkilladj == OOM_DISABLE)
 			continue;
-		if (p->flags & PF_SWAPOFF)
-			return p;
 
 		points = badness(p, uptime.tv_sec);
 		if (points > *ppoints || !chosen) {