diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-08-17 14:18:51 +0530 |
| commit | db5bc601e46abbb8fc4c17a6bc848c560e80fe57 (patch) | |
| tree | b1eb723eb8acd5261336cef1b968311e6332a7b6 /mm/mprotect.c | |
| parent | d98f3af5986fae62bacbe7e83026660d61621a3a (diff) | |
| parent | 21b5f5d91a589931a22009d918fd319f481e8eee (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
fs/f2fs/super.c
Pick changes from LTS commit 76517ed2a7fe
("f2fs: sanity check checkpoint segno and blkoff"),
over changes from AOSP commit 0f127e451bc7
("FROMLIST: f2fs: sanity check checkpoint segno and blkoff")
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'mm/mprotect.c')
| -rw-r--r-- | mm/mprotect.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/mprotect.c b/mm/mprotect.c index bddb2c75492d..b8849a3930a0 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -72,6 +72,7 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, if (!pte) return 0; + flush_tlb_batched_pending(vma->vm_mm); arch_enter_lazy_mmu_mode(); do { oldpte = *pte; |