---

yaml --- r: 54177 b: refs/heads/master c: 9a82782 h: refs/heads/master i: 54175: 35d4a77 v: v3
git-mirror · May 7, 2007 · eed27a0 · eed27a0
1 parent 3ae9a99
commit eed27a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d67f2d7c0fb28b0eb6a6aa100b190526a971ad9
+refs/heads/master: 9a82782f8f58219d0c6dc5f0211ce301adf6c6f4
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -147,9 +147,11 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
 	 * Adjust the score by oomkilladj.
 	 */
 	if (p->oomkilladj) {
-		if (p->oomkilladj > 0)
+		if (p->oomkilladj > 0) {
+			if (!points)
+				points = 1;
 			points <<= p->oomkilladj;
-		else
+		} else
 			points >>= -(p->oomkilladj);
 	}