diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /mm/oom_kill.c | |
parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 14bd4ec79597..b05ab8f2a562 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -271,6 +271,7 @@ void out_of_memory(gfp_t gfp_mask, int order) | |||
271 | if (printk_ratelimit()) { | 271 | if (printk_ratelimit()) { |
272 | printk("oom-killer: gfp_mask=0x%x, order=%d\n", | 272 | printk("oom-killer: gfp_mask=0x%x, order=%d\n", |
273 | gfp_mask, order); | 273 | gfp_mask, order); |
274 | dump_stack(); | ||
274 | show_mem(); | 275 | show_mem(); |
275 | } | 276 | } |
276 | 277 | ||