Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b8cdbde authored by Greg Hackmann's avatar Greg Hackmann
Browse files

Revert "proc: make oom adjustment files user read-only" 

CTS no longer expects oom_{adj,score_adj} to be read-only.  See
https://android-review.googlesource.com/530687/

 for additional context.

This reverts commit 1ba6b2f4.

Bug: 63142211
Change-Id: I4a1472c3efeaf74d11c678a0b92e1687c5f43702
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
parent 836f51f1

fs/proc/base.c

+4 −5
Original line number Diff line number Diff line
@@ -2602,9 +2602,8 @@ static const struct pid_entry tgid_base_stuff[] = { 
	ONE("cgroup",  S_IRUGO, proc_cgroup_show),

#endif

	ONE("oom_score",  S_IRUGO, proc_oom_score),

	INF("oom_score",  S_IRUGO, proc_oom_score),

	REG("oom_adj",    S_IRUSR, proc_oom_adj_operations),

	REG("oom_score_adj", S_IRUSR, proc_oom_score_adj_operations),

	REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adj_operations),

	REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),

#ifdef CONFIG_AUDITSYSCALL

	REG("loginuid",   S_IWUSR|S_IRUGO, proc_loginuid_operations),

	REG("sessionid",  S_IRUGO, proc_sessionid_operations),
@@ -2988,8 +2987,8 @@ static const struct pid_entry tid_base_stuff[] = { 
	ONE("cgroup",  S_IRUGO, proc_cgroup_show),

#endif

	ONE("oom_score", S_IRUGO, proc_oom_score),

	REG("oom_adj",   S_IRUSR, proc_oom_adj_operations),

	REG("oom_score_adj", S_IRUSR, proc_oom_score_adj_operations),

	REG("oom_adj",   S_IRUGO|S_IWUSR, proc_oom_adj_operations),

	REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),

#ifdef CONFIG_AUDITSYSCALL

	REG("loginuid",  S_IWUSR|S_IRUGO, proc_loginuid_operations),

	REG("sessionid",  S_IRUGO, proc_sessionid_operations),