| From 42a4fb9082d9fdc88c353fff81e7e5ee8a17dbde Mon Sep 17 00:00:00 2001 |
| From: Dave Kleikamp <dave.kleikamp@oracle.com> |
| Date: Mon, 17 Dec 2012 11:52:47 -0600 |
| Subject: sparc: huge_ptep_set_* functions need to call set_huge_pte_at() |
| |
| |
| From: Dave Kleikamp <dave.kleikamp@oracle.com> |
| |
| [ 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> |
| --- |
| arch/sparc/include/asm/hugetlb.h | 10 ++++++++-- |
| 1 file changed, 8 insertions(+), 2 deletions(-) |
| |
| --- a/arch/sparc/include/asm/hugetlb.h |
| +++ b/arch/sparc/include/asm/hugetlb.h |
| @@ -61,14 +61,20 @@ static inline pte_t huge_pte_wrprotect(p |
| 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) |
