diff --git a/[refs] b/[refs]
index 22a61f52199b..f991a31c2b04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a41c58a6665cc995e237303b05db42100b71b65e
+refs/heads/master: ff05b6f7ae762b6eb464183eec994b28ea09f6dd
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 76f2c5ae908e..069b64e521fc 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/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;