From b3aa4321d2d822e7f3077c2d797369ba533cbd4a Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Fri, 8 Jun 2012 13:21:26 -0700 Subject: [PATCH] --- yaml --- r: 310643 b: refs/heads/master c: 1e11ad8dc42975d5c2bab7d478f6cd875602eda4 h: refs/heads/master i: 310641: 694f4b0f44f6149e2fe1150305012ee06d233336 310639: e917ca779fad7e1c3a2d4c1f0992596fc68acf47 v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1d8607caf051..659b97c5a92d 100644 --- 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 index ed0e19677360..416637f0e924 100644 --- 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; } /*