summaryrefslogtreecommitdiff
path: root/fs/proc/inode.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-12 21:59:19 +0300
committerMark Brown <broonie@kernel.org>2018-01-12 21:59:19 +0300
commit9d66a875ecc7d6dd414121e4508340d6c08f51b0 (patch)
treed446bb455780d9058efe1760745bfb63207090de /fs/proc/inode.c
parent987da3fe175933c28aab2293505c3597052ff0e2 (diff)
parentdd1dbf94d2826a045fbbe2649d84b27d48620d56 (diff)
downloadlinux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.xz
Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-intel
Diffstat (limited to 'fs/proc/inode.c')
-rw-r--r--fs/proc/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 225f541f7078..dd0f82622427 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -483,7 +483,7 @@ int proc_fill_super(struct super_block *s, void *data, int silent)
/* User space would break if executables or devices appear on proc */
s->s_iflags |= SB_I_USERNS_VISIBLE | SB_I_NOEXEC | SB_I_NODEV;
- s->s_flags |= MS_NODIRATIME | MS_NOSUID | MS_NOEXEC;
+ s->s_flags |= SB_NODIRATIME | SB_NOSUID | SB_NOEXEC;
s->s_blocksize = 1024;
s->s_blocksize_bits = 10;
s->s_magic = PROC_SUPER_MAGIC;