From 4e027311f502873405e3be01a92988335ac7efc8 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Tue, 8 Jul 2008 11:31:06 +0200
Subject: [PATCH] --- yaml --- r: 98776 b: refs/heads/master c:
 138c9021ca68d6f8a6fac3418995fee102a3cc22 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/include/asm-powerpc/hugetlb.h       |  6 ++++++
 trunk/include/asm-powerpc/pgtable-ppc64.h | 10 ----------
 trunk/include/asm-s390/pgtable.h          |  5 ++++-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 4428ac4517e5..d32b8fe38b9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86df86424939d316b1f6cfac1b6204f0c7dee317
+refs/heads/master: 138c9021ca68d6f8a6fac3418995fee102a3cc22
diff --git a/trunk/include/asm-powerpc/hugetlb.h b/trunk/include/asm-powerpc/hugetlb.h
index be32ff02f4a0..649c6c3b87b3 100644
--- a/trunk/include/asm-powerpc/hugetlb.h
+++ b/trunk/include/asm-powerpc/hugetlb.h
@@ -49,6 +49,12 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)
 	return pte_wrprotect(pte);
 }
 
+static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
+					   unsigned long addr, pte_t *ptep)
+{
+	ptep_set_wrprotect(mm, addr, ptep);
+}
+
 static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
 					     unsigned long addr, pte_t *ptep,
 					     pte_t pte, int dirty)
diff --git a/trunk/include/asm-powerpc/pgtable-ppc64.h b/trunk/include/asm-powerpc/pgtable-ppc64.h
index 7686569a0bef..cc6a43ba41d0 100644
--- a/trunk/include/asm-powerpc/pgtable-ppc64.h
+++ b/trunk/include/asm-powerpc/pgtable-ppc64.h
@@ -314,16 +314,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
 	old = pte_update(mm, addr, ptep, _PAGE_RW, 0);
 }
 
-static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
-					   unsigned long addr, pte_t *ptep)
-{
-	unsigned long old;
-
-	if ((pte_val(*ptep) & _PAGE_RW) == 0)
-		return;
-	old = pte_update(mm, addr, ptep, _PAGE_RW, 1);
-}
-
 /*
  * We currently remove entries from the hashtable regardless of whether
  * the entry was young or dirty. The generic routines only flush if the
diff --git a/trunk/include/asm-s390/pgtable.h b/trunk/include/asm-s390/pgtable.h
index c7f4f8e3e297..bd0ea191dfa9 100644
--- a/trunk/include/asm-s390/pgtable.h
+++ b/trunk/include/asm-s390/pgtable.h
@@ -223,6 +223,9 @@ extern char empty_zero_page[PAGE_SIZE];
 #define _PAGE_SPECIAL	0x004		/* SW associated with special page */
 #define __HAVE_ARCH_PTE_SPECIAL
 
+/* Set of bits not changed in pte_modify */
+#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_SPECIAL)
+
 /* Six different types of pages. */
 #define _PAGE_TYPE_EMPTY	0x400
 #define _PAGE_TYPE_NONE		0x401
@@ -681,7 +684,7 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt
  */
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 {
-	pte_val(pte) &= PAGE_MASK;
+	pte_val(pte) &= _PAGE_CHG_MASK;
 	pte_val(pte) |= pgprot_val(newprot);
 	return pte;
 }