diff --git a/[refs] b/[refs] index 6eef41e47ee1..6ec7df556c9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8b8c977734193adedf2b0f607d6252c78e86394 +refs/heads/master: e91a810e884850781a1cada2ea81b8016881d244 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 824cade07827..91a081a82f55 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -496,7 +496,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order) panic("Out of memory and no killable processes...\n"); } - if (oom_kill_process(p, points, gfp_mask, order, + if (oom_kill_process(p, gfp_mask, order, points, "Out of memory")) goto retry;