X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=96473b482099793384af969b8158e1306e2d4f58;hb=5e5419734c8719cbc01af959ad9c0844002c0df5;hp=824cade078277fda90f06799001a563a45680394;hpb=4800be295c34268fd3211d49828bfaa6bf62867f;p=powerpc.git diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 824cade078..96473b4820 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -286,7 +286,7 @@ static void __oom_kill_task(struct task_struct *p, int verbose) * all the memory it needs. That way it should be able to * exit() and clear out its resources quickly... */ - p->time_slice = HZ; + p->rt.time_slice = HZ; set_tsk_thread_flag(p, TIF_MEMDIE); force_sig(SIGKILL, p); @@ -496,7 +496,7 @@ retry: 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;