Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[mirror_ubuntu-artful-kernel.git] / mm / mprotect.c

diff --git a/mm/mprotect.c b/mm/mprotect.c
index dd599fc235c2fe5ce483128bb89dfad29dc104cd..44727811bf4cf62e3579261ee9699a37fab78b3d 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -86,6 +86,10 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                                page = vm_normal_page(vma, addr, oldpte);
                                if (!page || PageKsm(page))
                                        continue;
+
+                               /* Avoid TLB flush if possible */
+                               if (pte_protnone(oldpte))
+                                       continue;
                        }
 
                        ptent = ptep_modify_prot_start(mm, addr, pte);