From eed27a0a8f01e370f079e6b39349e3675a72ce2a Mon Sep 17 00:00:00 2001
From: Joshua N Pritikin <jpritikin@pobox.com>
Date: Sun, 6 May 2007 14:49:07 -0700
Subject: [PATCH] --- yaml --- r: 54177 b: refs/heads/master c:
 9a82782f8f58219d0c6dc5f0211ce301adf6c6f4 h: refs/heads/master i:   54175:
 35d4a7730189b80b4fb513c7d37054d99d18c56f v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 539e107089b3..b947710c62ff 100644
--- 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
index 3791edfffeeb..a35e7a8ebd7e 100644
--- 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);
 	}