diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-03-12 16:28:09 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-11 21:39:04 +0100 |
| commit | 2486206fbc9bd82a1d47106e08999f5835a27ab7 (patch) | |
| tree | 9b7bf718c08f454ad157298a954dbfc2f6ce5f6e /arch | |
| parent | 40b95a9f922783306f469398ae645af70724d417 (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 commit 71fdb6bf61bf0692f004f9daf5650392c0cfe300)
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'arch')
| -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 d17f26ca87f5..676167bd50e3 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; |