summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2020-09-15 09:59:33 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2020-09-15 09:59:32 -0700
commit2216f758d2632e82ccdf907db4745d4e2eb6d527 (patch)
tree02bddc3f8717693cf678d5555391ea6cd203c0b6
parent9ce9e58eb76239c09059764092f0e69d67ccf9b5 (diff)
parent90cbaf5095aa53f37dca49c4e5b2593518cfa955 (diff)
Merge "ANDROID: Take reference to task_struct with in the rcu section"
-rw-r--r--drivers/staging/android/lowmemorykiller.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index ee4c11b4e164..62a51d9b7611 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -665,6 +665,7 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
}
task_lock(selected);
+ get_task_struct(selected);
send_sig(SIGKILL, selected, 0);
/*
* FIXME: lowmemorykiller shouldn't abuse global OOM killer
@@ -713,7 +714,6 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
lowmem_deathpending_timeout = jiffies + HZ;
rem += selected_tasksize;
rcu_read_unlock();
- get_task_struct(selected);
/* give the system time to free up the memory */
msleep_interruptible(20);
trace_almk_shrink(selected_tasksize, ret,