diff --git a/[refs] b/[refs] index b297e8f5d482..1ad68f430239 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5081dde33f7a61d28d9b185cc386f12cb837c7a4 +refs/heads/master: b72f160443cb78b2f8addae6e331d2adaa70f869 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 12cd4735dc29..c5e384000585 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -381,8 +381,9 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order) return; if (printk_ratelimit()) { - printk("oom-killer: gfp_mask=0x%x, order=%d\n", - gfp_mask, order); + printk(KERN_WARNING "%s invoked oom-killer: " + "gfp_mask=0x%x, order=%d, oomkilladj=%d\n", + current->comm, gfp_mask, order, current->oomkilladj); dump_stack(); show_mem(); }