android: fix build error
cover android: fix build error
commit 0753ba01 (mm: revert "oom: move oom_adj value") reverted some regression patch. but it didn't revert one oom retrieved driver patch (it is android lowoomkiller in staging tree).
This patch series fixes it.
patch [1/2] is for 2.6.31 stable tree patch [2/2] is for -mm tree
-mm tree need both [1/2] and [2/2].
Thanks.
PATCH RESEND 1/2 Revert "Staging: android: lowmemorykiller.c: fix it for "oom: move oom_adj value from task_struct to mm_struct""
commit 0753ba01 (mm: revert "oom: move oom_adj value") reverted some regression patch. but it didn't revert one oom retrieved driver patch.
Then, it made build error to the driver. This reverts commit a6a9f81ccc9f5c86ccc22bbed1960a57d0316e8b too and fixes the build error.
--- drivers/staging/android/lowmemorykiller.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/android/lowmemorykiller.c +3 -5
@@ -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->oomkilladj;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 ;
Signature · 1 line
1.6.2.5
PATCH 2/2 lowmemorykiller: fix build error to move oom_adj
In reply to KOSAKI MotohiroRecently, oom_adj moved from task_struct to signal_struct. Then, the oom_adj treating code in android driver also should be changed.
--- drivers/staging/android/lowmemorykiller.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/android/lowmemorykiller.c +1 -1
@@ -106,7 +106,7 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)task_unlock (p);continue ; } - oom_adj = p->oomkilladj; + oom_adj = p->signal->oom_adj;if (oom_adj < min_adj) {task_unlock (p);continue ;
Signature · 1 line
1.6.2.5