From 20060597e1c1408c7dc5c44c4fee904154decd92 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Mon, 9 Aug 2010 17:18:47 -0700
Subject: [PATCH] --- yaml --- r: 207207 b: refs/heads/master c:
 c81fac5cb8c92b8b4795ac250a46c7514d1fce06 h: refs/heads/master i:   207205:
 652c2658235a3825225d23fb576bf97ff4310dd5   207203:
 322b5fbdcc8321bb907c3b089fd8fb4c754cd901   207199:
 b8e849a3885753eb501d242d18a6644156991207 v: v3

---
 [refs]              | 2 +-
 trunk/mm/oom_kill.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3b71129fe36b..a0303c7a9509 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74ab7f1d3f22ccb02f8b14f1f2375416b1ab0adb
+refs/heads/master: c81fac5cb8c92b8b4795ac250a46c7514d1fce06
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index ef4ed4ae6f64..907e2c0ad7a6 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -357,10 +357,10 @@ static void dump_tasks(const struct mem_cgroup *mem)
 			continue;
 		}
 
-		printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d     %3d %s\n",
+		printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3u     %3d %s\n",
 		       task->pid, __task_cred(task)->uid, task->tgid,
 		       task->mm->total_vm, get_mm_rss(task->mm),
-		       (int)task_cpu(task), task->signal->oom_adj, p->comm);
+		       task_cpu(task), task->signal->oom_adj, task->comm);
 		task_unlock(task);
 	}
 }