---

yaml --- r: 4209 b: refs/heads/master c: 4263926 h: refs/heads/master i: 4207: 8887e78 v: v3
git-mirror · Jul 8, 2005 · b995756 · b995756
1 parent e5a6d7a
commit b995756
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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: