lkml.org 
[lkml]   [2010]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/10] oom: remove verbose argument from __oom_kill_process()
    Date
    Now, verbose argument is unused. This patch remove it.

    [remark: this patch is needed to fold to "oom: remove PF_EXITING
    check completely"]

    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    ---
    mm/oom_kill.c | 20 +++++++++-----------
    1 files changed, 9 insertions(+), 11 deletions(-)

    diff --git a/mm/oom_kill.c b/mm/oom_kill.c
    index 0d7397b..3c83fba 100644
    --- a/mm/oom_kill.c
    +++ b/mm/oom_kill.c
    @@ -384,20 +384,18 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
    * flag though it's unlikely that we select a process with CAP_SYS_RAW_IO
    * set.
    */
    -static int __oom_kill_process(struct task_struct *p, struct mem_cgroup *mem,
    - int verbose)
    +static int __oom_kill_process(struct task_struct *p, struct mem_cgroup *mem)
    {
    p = find_lock_task_mm(p);
    if (!p)
    return 1;

    - if (verbose)
    - printk(KERN_ERR "Killed process %d (%s) "
    - "vsz:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
    - task_pid_nr(p), p->comm,
    - K(p->mm->total_vm),
    - K(get_mm_counter(p->mm, MM_ANONPAGES)),
    - K(get_mm_counter(p->mm, MM_FILEPAGES)));
    + printk(KERN_ERR "Killed process %d (%s) "
    + "vsz:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
    + task_pid_nr(p), p->comm,
    + K(p->mm->total_vm),
    + K(get_mm_counter(p->mm, MM_ANONPAGES)),
    + K(get_mm_counter(p->mm, MM_FILEPAGES)));
    task_unlock(p);

    /*
    @@ -437,7 +435,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,

    if (c->mm == p->mm)
    continue;
    - if (oom_unkillable(c, mem, nodemask))
    + if (oom_unkillable(c, mem))
    continue;

    /* badness() returns 0 if the thread is unkillable */
    @@ -449,7 +447,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
    }
    } while_each_thread(p, t);

    - return __oom_kill_process(victim, mem, 1);
    + return __oom_kill_process(victim, mem);
    }

    #ifdef CONFIG_CGROUP_MEM_RES_CTLR
    --
    1.6.5.2




    \
     
     \ /
      Last update: 2010-06-08 13:57    [W:4.480 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site