aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMarcelo Tosatti <marcelo.tosatti@cyclades.com>2005-07-07 17:56:04 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 18:23:35 -0700
commit79b9ce311e192e9a31fd9f3cf1ee4a4edf9e2650 (patch)
tree210896405b2b70aded7582750e20967df8c8e7bf /mm
parentcb2c0233755429037462e16ea0d5497a0092738c (diff)
downloadmrst-s0i3-test-79b9ce311e192e9a31fd9f3cf1ee4a4edf9e2650.tar.gz
mrst-s0i3-test-79b9ce311e192e9a31fd9f3cf1ee4a4edf9e2650.tar.xz
mrst-s0i3-test-79b9ce311e192e9a31fd9f3cf1ee4a4edf9e2650.zip
[PATCH] print order information when OOM killing
Dump the current allocation order when OOM killing. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/oom_kill.c4
-rw-r--r--mm/page_alloc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 59666d905f1..e20d559edba 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -253,12 +253,12 @@ static struct mm_struct *oom_kill_process(struct task_struct *p)
* OR try to be smart about which process to kill. Note that we
* don't have to be perfect here, we just have to be good.
*/
-void out_of_memory(unsigned int __nocast gfp_mask)
+void out_of_memory(unsigned int __nocast gfp_mask, int order)
{
struct mm_struct *mm = NULL;
task_t * p;
- printk("oom-killer: gfp_mask=0x%x\n", gfp_mask);
+ printk("oom-killer: gfp_mask=0x%x, order=%d\n", gfp_mask, order);
/* print memory stats */
show_mem();
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3c9f7f88112..7fbd3ea8765 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -936,7 +936,7 @@ rebalance:
goto got_pg;
}
- out_of_memory(gfp_mask);
+ out_of_memory(gfp_mask, order);
goto restart;
}