diff options
author | Will Deacon <will.deacon@arm.com> | 2017-06-26 10:54:27 +0100 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2017-06-26 10:54:27 +0100 |
commit | 3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb (patch) | |
tree | 81e5823a1c84a0131dc110f711f3c1416b4df985 /fs/proc | |
parent | 9ad95c46c18ba828dfcf467024a45eb5b43ce769 (diff) | |
parent | 77b246b32b2c4bc21e352dcb8b53a8aba81ee5a4 (diff) | |
download | linux-stable-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.tar.gz linux-stable-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.tar.bz2 linux-stable-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.zip |
Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core
Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 45f6bf68fff3..f1e1927ccd48 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -821,7 +821,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf, if (!mmget_not_zero(mm)) goto free; - flags = write ? FOLL_WRITE : 0; + flags = FOLL_FORCE | (write ? FOLL_WRITE : 0); while (count > 0) { int this_len = min_t(int, count, PAGE_SIZE); |