Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / android / lowmemorykiller.c

diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index b545d3d1da3e5f6ccbd59f783e55ce30ff23479d..feafa172b155a2ecabea27dfe3b149efb0dd2745 100644 (file)
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -160,7 +160,12 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
                             selected->pid, selected->comm,
                             selected_oom_score_adj, selected_tasksize);
                lowmem_deathpending_timeout = jiffies + HZ;
-               set_tsk_thread_flag(selected, TIF_MEMDIE);
+               /*
+                * FIXME: lowmemorykiller shouldn't abuse global OOM killer
+                * infrastructure. There is no real reason why the selected
+                * task should have access to the memory reserves.
+                */
+               mark_tsk_oom_victim(selected);
                send_sig(SIGKILL, selected, 0);
                rem += selected_tasksize;
        }