From 14a31472f97e0f53158327d0f7d2fd8f99fb7f42 Mon Sep 17 00:00:00 2001 From: Rik van Riel Date: Tue, 6 Nov 2012 09:56:01 +0000 Subject: [PATCH] --- yaml --- r: 344773 b: refs/heads/master c: cef23d9db6b76732d9b0933cb162358a6a1f43d7 h: refs/heads/master i: 344771: 161a036f8d035823ea90aed54e410b5960cf6589 v: v3 --- [refs] | 2 +- trunk/mm/pgtable-generic.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 953c9006be48..52e6aeadb8dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4a1cc56e4d728eb87072c71c07581524e5160b1 +refs/heads/master: cef23d9db6b76732d9b0933cb162358a6a1f43d7 diff --git a/trunk/mm/pgtable-generic.c b/trunk/mm/pgtable-generic.c index e642627da6b7..d8397da42fe6 100644 --- a/trunk/mm/pgtable-generic.c +++ b/trunk/mm/pgtable-generic.c @@ -12,8 +12,8 @@ #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS /* - * Only sets the access flags (dirty, accessed, and - * writable). Furthermore, we know it always gets set to a "more + * Only sets the access flags (dirty, accessed), as well as write + * permission. Furthermore, we know it always gets set to a "more * permissive" setting, which allows most architectures to optimize * this. We return whether the PTE actually changed, which in turn * instructs the caller to do things like update__mmu_cache. This @@ -27,7 +27,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma, int changed = !pte_same(*ptep, entry); if (changed) { set_pte_at(vma->vm_mm, address, ptep, entry); - flush_tlb_page(vma, address); + flush_tlb_fix_spurious_fault(vma, address); } return changed; }