---

yaml --- r: 4207 b: refs/heads/master c: 79b9ce3 h: refs/heads/master i: 4205: e22a4fe 4203: 9d94edc 4199: cae3bc2 4191: a665536 v: v3
git-mirror · Jul 8, 2005 · 8887e78 · 8887e78
1 parent 71cdea5
commit 8887e78
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb2c0233755429037462e16ea0d5497a0092738c
+refs/heads/master: 79b9ce311e192e9a31fd9f3cf1ee4a4edf9e2650
diff --git a/trunk/drivers/char/sysrq.c b/trunk/drivers/char/sysrq.c
@@ -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);

diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
@@ -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 *);

diff --git a/trunk/mm/oom_kill.c b/trunk/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/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -936,7 +936,7 @@ __alloc_pages(unsigned int __nocast gfp_mask, unsigned int order,
 				goto got_pg;
 		}
 
-		out_of_memory(gfp_mask);
+		out_of_memory(gfp_mask, order);
 		goto restart;
 	}