aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatalin Marinas2014-03-12 11:28:09 -0500
committerMark Brown2014-08-11 15:39:04 -0500
commit2486206fbc9bd82a1d47106e08999f5835a27ab7 (patch)
tree9b7bf718c08f454ad157298a954dbfc2f6ce5f6e
parent40b95a9f922783306f469398ae645af70724d417 (diff)
downloadkernel-video-2486206fbc9bd82a1d47106e08999f5835a27ab7.tar.gz
kernel-video-2486206fbc9bd82a1d47106e08999f5835a27ab7.tar.xz
kernel-video-2486206fbc9bd82a1d47106e08999f5835a27ab7.zip
arm64: Do not synchronise I and D caches for special ptes
Special pte mappings are not intended to be executable and do not even have an associated struct page. This patch ensures that we do not call __sync_icache_dcache() on such ptes. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Reported-by: Steve Capper <Steve.Capper@arm.com> Tested-by: Laura Abbott <lauraa@codeaurora.org> Tested-by: Bharat Bhushan <Bharat.Bhushan@freescale.com> Cc: <stable@vger.kernel.org> (cherry picked from commit 71fdb6bf61bf0692f004f9daf5650392c0cfe300) Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--arch/arm64/include/asm/pgtable.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index d17f26ca87f..676167bd50e 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -199,7 +199,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
199 pte_t *ptep, pte_t pte) 199 pte_t *ptep, pte_t pte)
200{ 200{
201 if (pte_valid_user(pte)) { 201 if (pte_valid_user(pte)) {
202 if (pte_exec(pte)) 202 if (!pte_special(pte) && pte_exec(pte))
203 __sync_icache_dcache(pte, addr); 203 __sync_icache_dcache(pte, addr);
204 if (pte_dirty(pte) && pte_write(pte)) 204 if (pte_dirty(pte) && pte_write(pte))
205 pte_val(pte) &= ~PTE_RDONLY; 205 pte_val(pte) &= ~PTE_RDONLY;