Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 76f2c5ae908e85a858c006d932edcdf9128e0cc2..069b64e521fccf2725199550653bfdb7055d6f81 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -176,7 +176,7 @@ static bool oom_unkillable_task(struct task_struct *p,
 unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,
                      const nodemask_t *nodemask, unsigned long totalpages)
 {
-       int points;
+       long points;
 
        if (oom_unkillable_task(p, mem, nodemask))
                return 0;