lkml.org 
[lkml]   [2009]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] linux-next: 20090929 - android driver build breaks
    Hi Greg,

    next-20090929 randconfig build breaks with
    CONFIG_ANDROID_LOW_MEMORY_KILLER=y

    drivers/staging/android/lowmemorykiller.c: In function 'lowmem_shrink':
    drivers/staging/android/lowmemorykiller.c:111: error: 'struct mm_struct' has no member named 'oom_adj'
    make[3]: *** [drivers/staging/android/lowmemorykiller.o] Error 1

    Commit 0753ba01e126020bf0f8150934903b48935b697d was reverted back,
    which moves back oom_adj from mm_struct to task_struct and commit
    28b83c5193e7ab951e402252278f2cc79dc4d298 moved the oomkilladj
    from task_struct to signal_struct.

    Following patch reverts the changes introduced by commit
    a6a9f81ccc9f5c86ccc22bbed1960a57d0316e8b to
    drivers/staging/android/lowmemorykiller.c

    Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
    --
    drivers/staging/android/lowmemorykiller.c | 8 +++-----
    1 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
    index 935d281..63ef837 100644
    --- a/drivers/staging/android/lowmemorykiller.c
    +++ b/drivers/staging/android/lowmemorykiller.c
    @@ -99,21 +99,19 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)

    read_lock(&tasklist_lock);
    for_each_process(p) {
    - struct mm_struct *mm;
    int oom_adj;

    task_lock(p);
    - mm = p->mm;
    - if (!mm) {
    + if (!p->mm) {
    task_unlock(p);
    continue;
    }
    - oom_adj = mm->oom_adj;
    + oom_adj = p->signal->oom_adj;
    if (oom_adj < min_adj) {
    task_unlock(p);
    continue;
    }
    - tasksize = get_mm_rss(mm);
    + tasksize = get_mm_rss(p->mm);
    task_unlock(p);
    if (tasksize <= 0)
    continue;
    Kamalesh


    \
     
     \ /
      Last update: 2009-09-29 17:23    [W:0.023 / U:1.124 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site