diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-03-12 16:28:09 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-05-29 09:18:32 +0800 |
| commit | 64fb9c18d5c50ce9698c99925294c55f71f15266 (patch) | |
| tree | 0512f966f84bfbcfcb0d013c60f6fa3725ffae53 | |
| parent | 455c6fdbd219161bd09b1165f11699d6d73de11c (diff) | |
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 upstream commit 71fdb6bf61bf0692f004f9daf5650392c0cfe300)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index aa3917c8b623..cdfdee7c13ca 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, pte_t *ptep, pte_t pte) { if (pte_valid_user(pte)) { - if (pte_exec(pte)) + if (!pte_special(pte) && pte_exec(pte)) __sync_icache_dcache(pte, addr); if (pte_dirty(pte) && pte_write(pte)) pte_val(pte) &= ~PTE_RDONLY; |