Merge mainline to test11-pre5

1 files changed, 8 insertions, 8 deletions

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index d49fab93a..45e865d25 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -117,18 +117,18 @@ static int badness(struct task_struct *p)
  */
 static struct task_struct * select_bad_process(void)
 {
-	int points = 0, maxpoints = 0;
+	int maxpoints = 0;
 	struct task_struct *p = NULL;
 	struct task_struct *chosen = NULL;
 
 	read_lock(&tasklist_lock);
-	for_each_task(p)
-	{
-		if (p->pid)
-			points = badness(p);
-		if (points > maxpoints) {
-			chosen = p;
-			maxpoints = points;
+	for_each_task(p) {
+		if (p->pid) {
+			int points = badness(p);
+			if (points > maxpoints) {
+				chosen = p;
+				maxpoints = points;
+			}
 		}
 	}
 	read_unlock(&tasklist_lock);