diff options
| author | Dave Kleikamp <dave.kleikamp@oracle.com> | 2012-12-17 11:52:47 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-11 09:03:47 -0800 |
| commit | 1e8928ab69d2e72f035adfc54d198b22b488c7e1 (patch) | |
| tree | 1a6e59c8e3b4f37a9762cab57560685a95bca77c /arch/sparc | |
| parent | 6fe7238ef44ba212b7f6d912c47f8e72ec1b9984 (diff) | |
| download | kernel_samsung_smdk4412-1e8928ab69d2e72f035adfc54d198b22b488c7e1.zip kernel_samsung_smdk4412-1e8928ab69d2e72f035adfc54d198b22b488c7e1.tar.gz kernel_samsung_smdk4412-1e8928ab69d2e72f035adfc54d198b22b488c7e1.tar.bz2 | |
sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
[ Upstream commit 6cb9c3697585c47977c42c5cc1b9fc49247ac530 ]
Modifying the huge pte's requires that all the underlying pte's be
modified.
Version 2: added missing flush_tlb_page()
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/hugetlb.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h index 1770610..f368cef 100644 --- a/arch/sparc/include/asm/hugetlb.h +++ b/arch/sparc/include/asm/hugetlb.h @@ -58,14 +58,20 @@ static inline pte_t huge_pte_wrprotect(pte_t pte) static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { - ptep_set_wrprotect(mm, addr, ptep); + pte_t old_pte = *ptep; + set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte)); } static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t pte, int dirty) { - return ptep_set_access_flags(vma, addr, ptep, pte, dirty); + int changed = !pte_same(*ptep, pte); + if (changed) { + set_huge_pte_at(vma->vm_mm, addr, ptep, pte); + flush_tlb_page(vma, addr); + } + return changed; } static inline pte_t huge_ptep_get(pte_t *ptep) |