From 8887e780629a10655ee59fef00f9571736172873 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Date: Thu, 7 Jul 2005 17:56:04 -0700
Subject: [PATCH] --- yaml --- r: 4207 b: refs/heads/master c:
 79b9ce311e192e9a31fd9f3cf1ee4a4edf9e2650 h: refs/heads/master i:   4205:
 e22a4fe8bce606fd7f2bfc22113bd2739fdf2209   4203:
 9d94edc12a2da3c36edee5e4c3867c319f87f4c2   4199:
 cae3bc2b646b3ae354d6d084c08b39322686a514   4191:
 a665536ad04c174e0d613a426239888afd672586 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/sysrq.c | 2 +-
 trunk/include/linux/swap.h | 2 +-
 trunk/mm/oom_kill.c        | 4 ++--
 trunk/mm/page_alloc.c      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 26eb0a4afb22..bc87c2f9ec44 100644
--- 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
index af79805b5576..12d563c648f7 100644
--- 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
index 2343f999e6e1..c75954f2d868 100644
--- 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
index 59666d905f19..e20d559edbaf 100644
--- 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
index 3c9f7f881125..7fbd3ea8765c 100644
--- 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;
 	}