diff options
| author | Mark Brown <broonie@kernel.org> | 2020-10-06 16:19:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-06 16:19:24 +0100 |
| commit | fd6b519a30a7179026d22c98d6bf10bb5ca8ca27 (patch) | |
| tree | e4a6bc4d8548a5b8db7148a18eb257b84e72d48b /mm/huge_memory.c | |
| parent | 43499134f50a77844f0503df2c995f43b858f4c3 (diff) | |
| parent | 856deb866d16e29bd65952e0289066f6078af773 (diff) | |
| download | linux-stable-fd6b519a30a7179026d22c98d6bf10bb5ca8ca27.tar.gz linux-stable-fd6b519a30a7179026d22c98d6bf10bb5ca8ca27.tar.bz2 linux-stable-fd6b519a30a7179026d22c98d6bf10bb5ca8ca27.zip | |
Merge tag 'v5.9-rc5' into asoc-5.10
Linux 5.9-rc5
Diffstat (limited to 'mm/huge_memory.c')
| -rw-r--r-- | mm/huge_memory.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 2ccff8472cd4..7ff29cc3d55c 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1291,12 +1291,13 @@ fallback: } /* - * FOLL_FORCE or a forced COW break can write even to unwritable pmd's, - * but only after we've gone through a COW cycle and they are dirty. + * FOLL_FORCE can write to even unwritable pmd's, but only + * after we've gone through a COW cycle and they are dirty. */ static inline bool can_follow_write_pmd(pmd_t pmd, unsigned int flags) { - return pmd_write(pmd) || ((flags & FOLL_COW) && pmd_dirty(pmd)); + return pmd_write(pmd) || + ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pmd_dirty(pmd)); } struct page *follow_trans_huge_pmd(struct vm_area_struct *vma, |