From d3d26d0fd0caffe06f3251d48d59103eaca731b6 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 28 Nov 2012 17:06:05 +0000
Subject: [PATCH] --- yaml --- r: 339199 b: refs/heads/master c:
 33eaa58f854770dc9c98411a356c98e3a53edfda h: refs/heads/master i:   339197:
 6065f37be81db13a333eadd377aaf78c091c3724   339195:
 53688b2f8cdffdbcb28b098bfc7b5e88bf6e2c55   339191:
 350010787fa69db9636e6b51bf12da478f6b8c0b   339183:
 6a15d40b9f74977ffc12f18331a3489bcb06405b   339167:
 75946c515da1b6c29c60072f262fcb56c890bd35   339135:
 59e29b85af32bd179f58348df40d68f2ab5fe368   339071:
 84317debc9b681d4bb65cf37dd0ad874dff62e17   338943:
 a8b5b06a001d4d6d40a154b41e6ff722d71aa1d9 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm64/include/asm/pgtable.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed2dfff39c83..f132435499b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f3bfa584ed05e9e7d290707c48eee026fb94ece
+refs/heads/master: 33eaa58f854770dc9c98411a356c98e3a53edfda
diff --git a/trunk/arch/arm64/include/asm/pgtable.h b/trunk/arch/arm64/include/asm/pgtable.h
index 8960239be722..937ae2064682 100644
--- a/trunk/arch/arm64/include/asm/pgtable.h
+++ b/trunk/arch/arm64/include/asm/pgtable.h
@@ -159,6 +159,8 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
 {
 	if (pte_present_exec_user(pte))
 		__sync_icache_dcache(pte, addr);
+	if (!pte_dirty(pte))
+		pte = pte_wrprotect(pte);
 	set_pte(ptep, pte);
 }