3.4-stable patches

added patches:
	sparc-huge_ptep_set_-functions-need-to-call-set_huge_pte_at.patch

diff --git a/queue-3.4/series b/queue-3.4/series
index dfe1379d7529951d67dcfb276802380b64b41404..65134a5758fd2ce3be98a69c34529f4272e2dd13 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -53,3 +53,4 @@ xhci-add-lynx-point-lp-to-list-of-intel-switchable-hosts.patch
 cgroup-remove-incorrect-dget-dput-pair-in-cgroup_create_dir.patch
 freezer-add-missing-mb-s-to-freezer_count-and-freezer_should_skip.patch
 x86-amd-disable-way-access-filter-on-piledriver-cpus.patch
+sparc-huge_ptep_set_-functions-need-to-call-set_huge_pte_at.patch

diff --git a/queue-3.4/sparc-huge_ptep_set_-functions-need-to-call-set_huge_pte_at.patch b/queue-3.4/sparc-huge_ptep_set_-functions-need-to-call-set_huge_pte_at.patch
new file mode 100644 (file)
index 0000000..125ff18
--- /dev/null
+++ b/queue-3.4/sparc-huge_ptep_set_-functions-need-to-call-set_huge_pte_at.patch
@@ -0,0 +1,49 @@
+From 3a7fbd649711a2bafa3ade1875b2b9b8b2ddc813 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
+@@ -58,14 +58,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)