diff options
| author | Steve Capper <steve.capper@linaro.org> | 2013-12-13 16:21:41 +0000 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2014-05-19 15:06:26 +0200 |
| commit | d3554ab17b8c9828567621b2b789a33b26a79f82 (patch) | |
| tree | 2a1ff12689ed1f4cfe8b2110122a5c61dd92898e /arch | |
| parent | b0f200ee53a41cf9cf52074d0b0d76c36ecd24f3 (diff) | |
arm: mm: Adjust the parameters for __sync_icache_dcache
Rather than take a pte_t as an input, break this down to the pfn
and whether or not the memory is executable.
This allows us to use this function for ptes and pmds.
Signed-off-by: Steve Capper <steve.capper@linaro.org>
Conflicts:
arch/arm/include/asm/pgtable.h
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/pgtable.h | 6 | ||||
| -rw-r--r-- | arch/arm/mm/flush.c | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 7d59b524f2af..9b4ad36be26f 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -225,11 +225,11 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd) #define pte_present_user(pte) (pte_present(pte) && (pte_val(pte) & L_PTE_USER)) #if __LINUX_ARM_ARCH__ < 6 -static inline void __sync_icache_dcache(pte_t pteval) +static inline void __sync_icache_dcache(unsigned long pfn, int exec); { } #else -extern void __sync_icache_dcache(pte_t pteval); +extern void __sync_icache_dcache(unsigned long pfn, int exec); #endif static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, @@ -238,7 +238,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, unsigned long ext = 0; if (addr < TASK_SIZE && pte_present_user(pteval)) { - __sync_icache_dcache(pteval); + __sync_icache_dcache(pte_pfn(pteval), pte_exec(pteval)); ext |= PTE_EXT_NG; } diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 3387e60e4ea3..df0d5caf69dd 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c @@ -232,16 +232,15 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p } #if __LINUX_ARM_ARCH__ >= 6 -void __sync_icache_dcache(pte_t pteval) +void __sync_icache_dcache(unsigned long pfn, int exec) { - unsigned long pfn; struct page *page; struct address_space *mapping; - if (cache_is_vipt_nonaliasing() && !pte_exec(pteval)) + if (cache_is_vipt_nonaliasing() && !exec) /* only flush non-aliasing VIPT caches for exec mappings */ return; - pfn = pte_pfn(pteval); + if (!pfn_valid(pfn)) return; @@ -254,7 +253,7 @@ void __sync_icache_dcache(pte_t pteval) if (!test_and_set_bit(PG_dcache_clean, &page->flags)) __flush_dcache_page(mapping, page); - if (pte_exec(pteval)) + if (exec) __flush_icache_all(); } #endif |