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); } }