From d3f0105bd7c4adb2bd5830a19772ce7638dd2bf6 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Mon, 25 Sep 2006 23:31:32 -0700
Subject: [PATCH] --- yaml --- r: 35607 b: refs/heads/master c:
 b72f160443cb78b2f8addae6e331d2adaa70f869 h: refs/heads/master i:   35605:
 fd58a727b502c8e086adc7a3041c6e8c015e68e1   35603:
 5b128f2c831695095c090555c950a1774609d1b5   35599:
 323bfcc08a07a7d0a41317e5628bb10b92038db3 v: v3

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

diff --git a/[refs] b/[refs]
index b297e8f5d482..1ad68f430239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5081dde33f7a61d28d9b185cc386f12cb837c7a4
+refs/heads/master: b72f160443cb78b2f8addae6e331d2adaa70f869
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 12cd4735dc29..c5e384000585 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -381,8 +381,9 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
 		return;
 
 	if (printk_ratelimit()) {
-		printk("oom-killer: gfp_mask=0x%x, order=%d\n",
-			gfp_mask, order);
+		printk(KERN_WARNING "%s invoked oom-killer: "
+			"gfp_mask=0x%x, order=%d, oomkilladj=%d\n",
+			current->comm, gfp_mask, order, current->oomkilladj);
 		dump_stack();
 		show_mem();
 	}