X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=873b6dbd2bf4ace2308b4fdcf5c48f856a864977;hb=052710fcf296f48df03c0e248eface251a7ab22c;hp=3de04b6173c51b474f5ff4110f08d79150d439c9;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 3de04b617..873b6dbd2 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -221,7 +221,7 @@ retry:
 /**
  * out_of_memory - is the system out of memory?
  */
-void out_of_memory(int gfp_mask)
+void out_of_memory(void)
 {
 	/*
 	 * oom_lock protects out_of_memory()'s static variables.
@@ -272,9 +272,6 @@ void out_of_memory(int gfp_mask)
 	 */
 	lastkill = now;
 
-	printk("oom-killer: gfp_mask=0x%x\n", gfp_mask);
-	show_free_areas();
-
 	/* oom_kill() sleeps */
 	spin_unlock(&oom_lock);
 	oom_kill();