Merge tag 'platform-drivers-x86-v4.12-2' of git://git.infradead.org/linux-platform...

[karo-tx-linux.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 9e3ac5c1178039ad16eb6476e62d542b38f5748b..f1e1927ccd484e7372fe2a38db7455468bbf06e8 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -821,10 +821,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
        if (!mmget_not_zero(mm))
                goto free;
 
-       /* Maybe we should limit FOLL_FORCE to actual ptrace users? */
-       flags = FOLL_FORCE;
-       if (write)
-               flags |= FOLL_WRITE;
+       flags = FOLL_FORCE | (write ? FOLL_WRITE : 0);
 
        while (count > 0) {
                int this_len = min_t(int, count, PAGE_SIZE);