From 8dde8d80c11efc3904f0e61a43d605226237a2c8 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Thu, 6 Nov 2008 12:53:29 -0800 Subject: [PATCH] --- yaml --- r: 118434 b: refs/heads/master c: b4416d2bea007f07f2e74cdc4cb64042ec996c83 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 59c0f20dcaa7..b4ed75c6093e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 953a64798d82ee5467da2bdc0e467ef874fbc208 +refs/heads/master: b4416d2bea007f07f2e74cdc4cb64042ec996c83 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 64e5b4bcd964..2846a58e5de9 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -295,6 +295,8 @@ static void dump_tasks(const struct mem_cgroup *mem) continue; if (mem && !task_in_mem_cgroup(p, mem)) continue; + if (!thread_group_leader(p)) + continue; task_lock(p); printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d %3d %s\n",