diff --git a/[refs] b/[refs] index 839592552f16..a9190e222de9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b52723c5607f7684c2c0c075f86f86da0d7fb6d0 +refs/heads/master: 8d6c83f0ba5e1bd1e8bb2e3c7de4c276dc247f99 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index c48c5ef3ccfd..fc81cb22869e 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -372,7 +372,7 @@ static void dump_tasks(const struct mem_cgroup *mem) } pr_info("[%5d] %5d %5d %8lu %8lu %3u %3d %5d %s\n", - task->pid, __task_cred(task)->uid, task->tgid, + task->pid, task_uid(task), task->tgid, task->mm->total_vm, get_mm_rss(task->mm), task_cpu(task), task->signal->oom_adj, task->signal->oom_score_adj, task->comm);