Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index b7de324bec1193dbb0d0eed756bcfbbb82e898ba..57df8a52e780c90d1fa433cf00146d03e174f09d 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2794,8 +2794,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),
-       REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adj_operations),
-       REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
+       REG("oom_adj",    S_IRUSR, proc_oom_adj_operations),
+       REG("oom_score_adj", S_IRUSR, proc_oom_score_adj_operations),
 #ifdef CONFIG_AUDITSYSCALL
        REG("loginuid",   S_IWUSR|S_IRUGO, proc_loginuid_operations),
        REG("sessionid",  S_IRUGO, proc_sessionid_operations),
@@ -3142,8 +3142,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_IRUGO|S_IWUSR, proc_oom_adj_operations),
-       REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
+       REG("oom_adj",   S_IRUSR, proc_oom_adj_operations),
+       REG("oom_score_adj", S_IRUSR, proc_oom_score_adj_operations),
 #ifdef CONFIG_AUDITSYSCALL
        REG("loginuid",  S_IWUSR|S_IRUGO, proc_loginuid_operations),
        REG("sessionid",  S_IRUGO, proc_sessionid_operations),