diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
| commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
| tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /mm/oom_kill.c | |
| parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
| parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) | |
Merge branch 'master'
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 | ||