X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=59666d905f1997521c89f4a7b1a492df4414be0e;hb=578c2fd6a7f378434655e5c480e23152a3994404;hp=4bbb1cb10495ea486db83868055762888835c8b3;hpb=c2f29ea111e3344ed48257c2a142c3db514e1529;p=mv-sheeva.git diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 4bbb1cb1049..59666d905f1 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -258,6 +258,10 @@ void out_of_memory(unsigned int __nocast gfp_mask) struct mm_struct *mm = NULL; task_t * p; + printk("oom-killer: gfp_mask=0x%x\n", gfp_mask); + /* print memory stats */ + show_mem(); + read_lock(&tasklist_lock); retry: p = select_bad_process(); @@ -268,12 +272,9 @@ retry: /* Found nothing?!?! Either we hang forever, or we panic. */ if (!p) { read_unlock(&tasklist_lock); - show_free_areas(); panic("Out of memory and no killable processes...\n"); } - printk("oom-killer: gfp_mask=0x%x\n", gfp_mask); - show_free_areas(); mm = oom_kill_process(p); if (!mm) goto retry;