From b99575659a349e63c068ab49c2f140487c7b82b5 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Thu, 7 Jul 2005 17:56:06 -0700
Subject: [PATCH] --- yaml --- r: 4209 b: refs/heads/master c:
 42639269f9ce4aac2e6c20bcbca30b5da8b9a899 h: refs/heads/master i:   4207:
 8887e780629a10655ee59fef00f9571736172873 v: v3

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

diff --git a/[refs] b/[refs]
index ea0c0e8deca2..a9be88a34ed0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37b173a4d03d1681e6c9529bc43d7a3308132db6
+refs/heads/master: 42639269f9ce4aac2e6c20bcbca30b5da8b9a899
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index e20d559edbaf..1e56076672f5 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -258,9 +258,11 @@ 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, order=%d\n", gfp_mask, order);
-	/* print memory stats */
-	show_mem();
+	if (printk_ratelimit()) {
+		printk("oom-killer: gfp_mask=0x%x, order=%d\n",
+			gfp_mask, order);
+		show_mem();
+	}
 
 	read_lock(&tasklist_lock);
 retry: