diff options
| author | Emanuele <scarlataemanuele@gmail.com> | 2016-03-25 13:25:44 +0100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-13 14:47:41 +1000 |
| commit | c12b9dadba69989e42d2065bd25c73301cc8729f (patch) | |
| tree | 6779fc9a9680c80702dee092b5ee630cc5ced920 /drivers | |
| parent | 9b0e84ac672845689861120bbb58b33788f7f6a3 (diff) | |
| download | kernel_samsung_smdk4412-c12b9dadba69989e42d2065bd25c73301cc8729f.tar.gz kernel_samsung_smdk4412-c12b9dadba69989e42d2065bd25c73301cc8729f.tar.bz2 kernel_samsung_smdk4412-c12b9dadba69989e42d2065bd25c73301cc8729f.zip | |
lowmemorykiller: fixes for new oom_score_adj
Change-Id: I34c547039d02366649206395fe3fb3f363fc900e
Signed-off-by: Emanuele Scarlata <scarlataemanuele@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/android/lowmemorykiller.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index f68459a36db..2c1d0929243 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -185,7 +185,7 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) #ifdef ENHANCED_LMK_ROUTINE for (i = 0; i < LOWMEM_DEATHPENDING_DEPTH; i++) - selected_oom_adj[i] = min_adj; + selected_oom_adj[i] = min_score_adj; #else selected_oom_score_adj = min_score_adj; #endif @@ -238,8 +238,8 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) break; } } - } else if (selected_oom_adj[max_selected_oom_idx] < oom_adj || - (selected_oom_adj[max_selected_oom_idx] == oom_adj && + } else if (selected_oom_adj[max_selected_oom_idx] < oom_score_adj || + (selected_oom_adj[max_selected_oom_idx] == oom_score_adj && selected_tasksize[max_selected_oom_idx] < tasksize)) { is_exist_oom_task = 1; } @@ -247,7 +247,7 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) if (is_exist_oom_task) { selected[max_selected_oom_idx] = p; selected_tasksize[max_selected_oom_idx] = tasksize; - selected_oom_adj[max_selected_oom_idx] = oom_adj; + selected_oom_adj[max_selected_oom_idx] = oom_score_adj; if (all_selected_oom < LOWMEM_DEATHPENDING_DEPTH) all_selected_oom++; @@ -263,7 +263,7 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) } lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n", - p->pid, p->comm, oom_adj, tasksize); + p->pid, p->comm, oom_score_adj, tasksize); } #else if (selected) { |