[libata] Prefer SCSI_SENSE_BUFFERSIZE to sizeof()

[linux-2.6-omap-h63xx.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index e3778f1215c085e68d985858701b83acdb725b86..91a081a82f55a330706f92d92cd54186ea6339af 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -278,7 +278,8 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
        }
 
        if (verbose)
-               printk(KERN_ERR "Killed process %d (%s)\n", p->pid, p->comm);
+               printk(KERN_ERR "Killed process %d (%s)\n",
+                               task_pid_nr(p), p->comm);
 
        /*
         * We give our sacrificial lamb high priority and access to
@@ -356,7 +357,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
        }
 
        printk(KERN_ERR "%s: kill process %d (%s) score %li or a child\n",
-                                       message, p->pid, p->comm, points);
+                                       message, task_pid_nr(p), p->comm, points);
 
        /* Try to kill a child first */
        list_for_each_entry(c, &p->children, sibling) {
@@ -495,7 +496,7 @@ retry:
                        panic("Out of memory and no killable processes...\n");
                }
 
-               if (oom_kill_process(p, points, gfp_mask, order,
+               if (oom_kill_process(p, gfp_mask, order, points,
                                     "Out of memory"))
                        goto retry;