diff --git a/[refs] b/[refs] index c95f615429ad..bdeae7207b67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 343e0d7a93951e35065fdb5e3dd61aece0ec6b3c +refs/heads/master: b958f7d9f35bfb61625f201cd92a3fc39504af7a diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 14bd4ec79597..b05ab8f2a562 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -271,6 +271,7 @@ void out_of_memory(gfp_t gfp_mask, int order) if (printk_ratelimit()) { printk("oom-killer: gfp_mask=0x%x, order=%d\n", gfp_mask, order); + dump_stack(); show_mem(); }