dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Marcelo Tosatti 2005-07-07 17:56:04 -07:00 committed by Linus Torvalds
parent cb2c023375
commit 79b9ce311e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/sysrq.c
View File

@ -228,7 +228,7 @@ static struct sysrq_key_op sysrq_term_op = {
static void moom_callback(void *ignored)
{
out_of_memory(GFP_KERNEL);
out_of_memory(GFP_KERNEL, 0);
}
static DECLARE_WORK(moom_work, moom_callback, NULL);

2
include/linux/swap.h
View File

@ -148,7 +148,7 @@ struct swap_list_t {
#define vm_swap_full() (nr_swap_pages*2 < total_swap_pages)
/* linux/mm/oom_kill.c */
extern void out_of_memory(unsigned int __nocast gfp_mask);
extern void out_of_memory(unsigned int __nocast gfp_mask, int order);
/* linux/mm/memory.c */
extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct *);

4
mm/oom_kill.c
View File

@ -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();

2
mm/page_alloc.c
View File

@ -936,7 +936,7 @@ rebalance:
goto got_pg;
}
out_of_memory(gfp_mask);
out_of_memory(gfp_mask, order);
goto restart;
}