diff options
author | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 11:20:41 -0600 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 11:20:41 -0600 |
commit | e9a623be5c984a1e344b2bb94e36e592f2491de6 (patch) | |
tree | 01a50401f03fc89193261cd4737ace912b0d1047 /arch/parisc/include/asm/cacheflush.h | |
parent | 6148a47ac3872092d4bc4888838bec6dff16654d (diff) | |
parent | 8b4ae3342dbcb6a0def3a7b3ae7aee633a81e758 (diff) | |
download | op-kernel-dev-e9a623be5c984a1e344b2bb94e36e592f2491de6.zip op-kernel-dev-e9a623be5c984a1e344b2bb94e36e592f2491de6.tar.gz |
Merge branch 'tmpalias-flush' into for-next
Diffstat (limited to 'arch/parisc/include/asm/cacheflush.h')
-rw-r--r-- | arch/parisc/include/asm/cacheflush.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h index f388a85..dc9286a 100644 --- a/arch/parisc/include/asm/cacheflush.h +++ b/arch/parisc/include/asm/cacheflush.h @@ -26,8 +26,6 @@ void flush_user_dcache_range_asm(unsigned long, unsigned long); void flush_kernel_dcache_range_asm(unsigned long, unsigned long); void flush_kernel_dcache_page_asm(void *); void flush_kernel_icache_page(void *); -void flush_user_dcache_page(unsigned long); -void flush_user_icache_page(unsigned long); void flush_user_dcache_range(unsigned long, unsigned long); void flush_user_icache_range(unsigned long, unsigned long); @@ -90,12 +88,15 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end); +/* defined in pacache.S exported in cache.c used by flush_anon_page */ +void flush_dcache_page_asm(unsigned long phys_addr, unsigned long vaddr); + #define ARCH_HAS_FLUSH_ANON_PAGE static inline void flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vmaddr) { if (PageAnon(page)) - flush_user_dcache_page(vmaddr); + flush_dcache_page_asm(page_to_phys(page), vmaddr); } #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE |