---

yaml --- r: 310643 b: refs/heads/master c: 1e11ad8 h: refs/heads/master i: 310641: 694f4b0 310639: e917ca7 v: v3
git-mirror · Jun 8, 2012 · b3aa432 · b3aa432
1 parent 1c05ddf
commit b3aa432
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72494504498ff5ac2f086a83473d4dd1ca490bd3
+refs/heads/master: 1e11ad8dc42975d5c2bab7d478f6cd875602eda4
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -183,7 +183,7 @@ static bool oom_unkillable_task(struct task_struct *p,
 unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
 			  const nodemask_t *nodemask, unsigned long totalpages)
 {
-	unsigned long points;
+	long points;
 
 	if (oom_unkillable_task(p, memcg, nodemask))
 		return 0;
@@ -223,7 +223,7 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
 	 * Never return 0 for an eligible task regardless of the root bonus and
 	 * oom_score_adj (oom_score_adj can't be OOM_SCORE_ADJ_MIN here).
 	 */
-	return points ? points : 1;
+	return points > 0 ? points : 1;
 }
 
 /*