ixgbe: add support for 82599 KR device 0x1517

[karo-tx-linux.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index ea2147dabba60febfb381b8fb788c9a0cbf9ed30..83cd9bb55092afd3bd18bdc2e1cce7888aa8c7a2 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -404,7 +404,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
                cpuset_print_task_mems_allowed(current);
                task_unlock(current);
                dump_stack();
-               mem_cgroup_print_oom_info(mem, current);
+               mem_cgroup_print_oom_info(mem, p);
                show_mem();
                if (sysctl_oom_dump_tasks)
                        dump_tasks(mem);
@@ -426,6 +426,8 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
        list_for_each_entry(c, &p->children, sibling) {
                if (c->mm == p->mm)
                        continue;
+               if (mem && !task_in_mem_cgroup(c, mem))
+                       continue;
                if (!oom_kill_task(c))
                        return 0;
        }