dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Staging: android: lowmemorykiller.c: fix it for "oom: move oom_adj value from task_struct to mm_struct" 

I'm about to merge "oom: move oom_adj value from task_struct to
mm_struct", and this fixup is needed to repair linux-next's
drivers/staging/android/lowmemorykiller.c.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Rientjes 2009-06-16 16:42:53 -07:00 committed by Greg Kroah-Hartman
parent de8f8bd633
commit a6a9f81ccc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/android/lowmemorykiller.c
View File

@ -96,19 +96,21 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
for_each_process(p) { for_each_process(p) {
struct mm_struct *mm;
int oom_adj; int oom_adj;
task_lock(p); task_lock(p);
if (!p->mm) { mm = p->mm;
if (!mm) {
task_unlock(p); task_unlock(p);
continue; continue;
} }
oom_adj = p->oomkilladj; oom_adj = mm->oom_adj;
if (oom_adj < min_adj) { if (oom_adj < min_adj) {
task_unlock(p); task_unlock(p);
continue; continue;
} }
tasksize = get_mm_rss(p->mm); tasksize = get_mm_rss(mm);
task_unlock(p); task_unlock(p);
if (tasksize <= 0) if (tasksize <= 0)
continue; continue;