From 9c92da6db30758789f82cbce7a22794757200791 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Fri, 11 Dec 2009 22:58:17 +0000
Subject: [PATCH] --- yaml --- r: 177023 b: refs/heads/master c:
 fcb4ebd678858850e8b029909064175cb627868d h: refs/heads/master i:   177021:
 336be805b67331089a15f7b1ca0119e66e8cb774   177019:
 38ae20e7893f8c690431d3a967c0b1d9427bbd13   177015:
 b1cfa2e6e5f5ea761dc90e9a539f0cf34262b9d6   177007:
 6a396cf2320a4b89b5c6c43e4bbb2b82384b6cad   176991:
 0de1a8b943efb17f1f5badd16098fc0ad1576b4d   176959:
 804ae30f4b6f9cc7206571dd638d0e233f0930a8   176895:
 55d9bbb21ccc7db342fc0d471cbc209207b5b3d8 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/sh/include/asm/pgtable_32.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a41307c13eaa..5201702631c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c89fbd3987d058fad3ea072aab68adfbdd13e498
+refs/heads/master: fcb4ebd678858850e8b029909064175cb627868d
diff --git a/trunk/arch/sh/include/asm/pgtable_32.h b/trunk/arch/sh/include/asm/pgtable_32.h
index b35435516203..5003ee86f67b 100644
--- a/trunk/arch/sh/include/asm/pgtable_32.h
+++ b/trunk/arch/sh/include/asm/pgtable_32.h
@@ -344,7 +344,8 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
 #define pte_special(pte)	((pte).pte_low & _PAGE_SPECIAL)
 
 #ifdef CONFIG_X2TLB
-#define pte_write(pte)		((pte).pte_high & _PAGE_EXT_USER_WRITE)
+#define pte_write(pte) \
+	((pte).pte_high & (_PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE))
 #else
 #define pte_write(pte)		((pte).pte_low & _PAGE_RW)
 #endif
@@ -358,7 +359,7 @@ static inline pte_t pte_##fn(pte_t pte) { pte.pte_##h op; return pte; }
  * individually toggled (and user permissions are entirely decoupled from
  * kernel permissions), we attempt to couple them a bit more sanely here.
  */
-PTE_BIT_FUNC(high, wrprotect, &= ~_PAGE_EXT_USER_WRITE);
+PTE_BIT_FUNC(high, wrprotect, &= ~(_PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE));
 PTE_BIT_FUNC(high, mkwrite, |= _PAGE_EXT_USER_WRITE | _PAGE_EXT_KERN_WRITE);
 PTE_BIT_FUNC(high, mkhuge, |= _PAGE_SZHUGE);
 #else