| Message ID | 20200515143646.3857579-11-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/29] arm: fix the flush_icache_range arguments in set_fiq_handler | expand |
On Fri, 2020-05-15 at 16:36 +0200, Christoph Hellwig wrote: > C6x needs almost no cache flushing routines of its own. Rely on > asm-generic/cacheflush.h for the defaults. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/c6x/include/asm/cacheflush.h | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/arch/c6x/include/asm/cacheflush.h b/arch/c6x/include/asm/cacheflush.h > index 4540b40475e6c..10922d528de6d 100644 > --- a/arch/c6x/include/asm/cacheflush.h > +++ b/arch/c6x/include/asm/cacheflush.h > @@ -16,21 +16,6 @@ > #include <asm/page.h> > #include <asm/string.h> > > -/* > - * virtually-indexed cache management (our cache is physically indexed) > - */ > -#define flush_cache_all() do {} while (0) > -#define flush_cache_mm(mm) do {} while (0) > -#define flush_cache_dup_mm(mm) do {} while (0) > -#define flush_cache_range(mm, start, end) do {} while (0) > -#define flush_cache_page(vma, vmaddr, pfn) do {} while (0) > -#define flush_cache_vmap(start, end) do {} while (0) > -#define flush_cache_vunmap(start, end) do {} while (0) > -#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0 > -#define flush_dcache_page(page) do {} while (0) > -#define flush_dcache_mmap_lock(mapping) do {} while (0) > -#define flush_dcache_mmap_unlock(mapping) do {} while (0) > - > /* > * physically-indexed cache management > */ > @@ -49,14 +34,12 @@ do { \ > (unsigned long) page_address(page) + PAGE_SIZE)); \ > } while (0) > > - > #define copy_to_user_page(vma, page, vaddr, dst, src, len) \ > do { \ > memcpy(dst, src, len); \ > flush_icache_range((unsigned) (dst), (unsigned) (dst) + (len)); \ > } while (0) > > -#define copy_from_user_page(vma, page, vaddr, dst, src, len) \ > - memcpy(dst, src, len) > +#include <asm-generic/cacheflush.h> > > #endif /* _ASM_C6X_CACHEFLUSH_H */ Acked-by: Mark Salter <msalter@redhat.com>
diff --git a/arch/c6x/include/asm/cacheflush.h b/arch/c6x/include/asm/cacheflush.h index 4540b40475e6c..10922d528de6d 100644 --- a/arch/c6x/include/asm/cacheflush.h +++ b/arch/c6x/include/asm/cacheflush.h @@ -16,21 +16,6 @@ #include <asm/page.h> #include <asm/string.h> -/* - * virtually-indexed cache management (our cache is physically indexed) - */ -#define flush_cache_all() do {} while (0) -#define flush_cache_mm(mm) do {} while (0) -#define flush_cache_dup_mm(mm) do {} while (0) -#define flush_cache_range(mm, start, end) do {} while (0) -#define flush_cache_page(vma, vmaddr, pfn) do {} while (0) -#define flush_cache_vmap(start, end) do {} while (0) -#define flush_cache_vunmap(start, end) do {} while (0) -#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0 -#define flush_dcache_page(page) do {} while (0) -#define flush_dcache_mmap_lock(mapping) do {} while (0) -#define flush_dcache_mmap_unlock(mapping) do {} while (0) - /* * physically-indexed cache management */ @@ -49,14 +34,12 @@ do { \ (unsigned long) page_address(page) + PAGE_SIZE)); \ } while (0) - #define copy_to_user_page(vma, page, vaddr, dst, src, len) \ do { \ memcpy(dst, src, len); \ flush_icache_range((unsigned) (dst), (unsigned) (dst) + (len)); \ } while (0) -#define copy_from_user_page(vma, page, vaddr, dst, src, len) \ - memcpy(dst, src, len) +#include <asm-generic/cacheflush.h> #endif /* _ASM_C6X_CACHEFLUSH_H */
C6x needs almost no cache flushing routines of its own. Rely on asm-generic/cacheflush.h for the defaults. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/c6x/include/asm/cacheflush.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)