Merge "proc: fix conversion of oom_score_adj to oom_adj" (2081c638) · Commits · e / devices / android_kernel_sony_msm8998

fs/proc/base.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -1018,15 +1018,20 @@ static ssize_t oom_adj_read(struct file file, char __user buf, size_t count,
		int oom_adj = OOM_ADJUST_MIN;
		size_t len;
		unsigned long flags;
		int mult = 1;

		if (!task)
		return -ESRCH;
		if (lock_task_sighand(task, &flags)) {
		if (task->signal->oom_score_adj == OOM_SCORE_ADJ_MAX)
		if (task->signal->oom_score_adj == OOM_SCORE_ADJ_MAX) {
		oom_adj = OOM_ADJUST_MAX;
		else
		oom_adj = (task->signal->oom_score_adj * -OOM_DISABLE) /
		OOM_SCORE_ADJ_MAX;
		} else {
		if (task->signal->oom_score_adj < 0)
		mult = -1;
		oom_adj = roundup(mult * task->signal->oom_score_adj *
		-OOM_DISABLE, OOM_SCORE_ADJ_MAX) /
		OOM_SCORE_ADJ_MAX * mult;
		}
		unlock_task_sighand(task, &flags);
		}
		put_task_struct(task);