[PATCH] USB: fix in usb_calc_bus_time

[pandora-kernel.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 59666d9..1e56076 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -253,14 +253,16 @@ static struct mm_struct *oom_kill_process(struct task_struct *p)
  * OR try to be smart about which process to kill. Note that we
  * don't have to be perfect here, we just have to be good.
  */
-void out_of_memory(unsigned int __nocast gfp_mask)
+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\n", gfp_mask);
-       /* 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: