From c7652773404ddf67ac6341ed4abb54186bf0423c Mon Sep 17 00:00:00 2001
From: Janet Morgan <janetmor@us.ibm.com>
Date: Tue, 21 Jun 2005 17:14:56 -0700
Subject: [PATCH] --- yaml --- r: 2455 b: refs/heads/master c:
 578c2fd6a7f378434655e5c480e23152a3994404 h: refs/heads/master i:   2453:
 c92953d5582670dc8842dd9533c3743d91e120d9   2451:
 d27591a40aa751b8068c3c8566f7cdb7be2fb568   2447:
 29da7e572e476d5f0896f2bccf1a3bedda801602 v: v3

---
 [refs]                | 2 +-
 trunk/mm/oom_kill.c   | 7 ++++---
 trunk/mm/page_alloc.c | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 202c1e260dfe..8d699d91206c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2f29ea111e3344ed48257c2a142c3db514e1529
+refs/heads/master: 578c2fd6a7f378434655e5c480e23152a3994404
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 4bbb1cb10495..59666d905f19 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -258,6 +258,10 @@ void out_of_memory(unsigned int __nocast gfp_mask)
 	struct mm_struct *mm = NULL;
 	task_t * p;
 
+	printk("oom-killer: gfp_mask=0x%x\n", gfp_mask);
+	/* print memory stats */
+	show_mem();
+
 	read_lock(&tasklist_lock);
 retry:
 	p = select_bad_process();
@@ -268,12 +272,9 @@ void out_of_memory(unsigned int __nocast gfp_mask)
 	/* Found nothing?!?! Either we hang forever, or we panic. */
 	if (!p) {
 		read_unlock(&tasklist_lock);
-		show_free_areas();
 		panic("Out of memory and no killable processes...\n");
 	}
 
-	printk("oom-killer: gfp_mask=0x%x\n", gfp_mask);
-	show_free_areas();
 	mm = oom_kill_process(p);
 	if (!mm)
 		goto retry;
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 10446a646374..be05d17bd7df 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -935,6 +935,7 @@ __alloc_pages(unsigned int __nocast gfp_mask, unsigned int order,
 			" order:%d, mode:0x%x\n",
 			p->comm, order, gfp_mask);
 		dump_stack();
+		show_mem();
 	}
 	return NULL;
 got_pg: