Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fbb2d3b authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: consolidate flush_dcache_mmap_lock/unlock() definitions. 



All of the flush_dcache_mmap_lock()/flush_dcache_mmap_unlock()
definitions are identical across all CPUs, so just provide them
generically in asm/cacheflush.h.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0b445dca

arch/sh/include/asm/cacheflush.h

+3 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#define flush_dcache_page(page)			do { } while (0)

#define flush_icache_range(start, end)		do { } while (0)

#define flush_icache_page(vma,pg)		do { } while (0)

#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)

#define flush_cache_sigtramp(vaddr)		do { } while (0)

#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)

#define __flush_wback_region(start, size)	do { (void)(start); } while (0)
@@ -71,6 +69,9 @@ extern void copy_from_user_page(struct vm_area_struct *vma, 
#define flush_cache_vmap(start, end)		flush_cache_all()

#define flush_cache_vunmap(start, end)		flush_cache_all()



#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)



void kmap_coherent_init(void);

void *kmap_coherent(struct page *page, unsigned long addr);

void kunmap_coherent(void);

arch/sh/include/cpu-common/cpu/cacheflush.h

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
#define flush_cache_range(vma, start, end)	do { } while (0)

#define flush_cache_page(vma, vmaddr, pfn)	do { } while (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)

#define flush_icache_range(start, end)		do { } while (0)

#define flush_icache_page(vma,pg)		do { } while (0)

#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)

arch/sh/include/cpu-sh2a/cpu/cacheflush.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#define flush_cache_range(vma, start, end)	do { } while (0)

#define flush_cache_page(vma, vmaddr, pfn)	do { } while (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)

void flush_icache_range(unsigned long start, unsigned long end);

#define flush_icache_page(vma,pg)		do { } while (0)

#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)

arch/sh/include/cpu-sh3/cpu/cacheflush.h

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ void flush_dcache_page(struct page *pg); 
void flush_icache_range(unsigned long start, unsigned long end);

void flush_icache_page(struct vm_area_struct *vma, struct page *page);



#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)



/* SH3 has unified cache so no special action needed here */

#define flush_cache_sigtramp(vaddr)		do { } while (0)

#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)

arch/sh/include/cpu-sh4/cpu/cacheflush.h

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start, 
void flush_cache_page(struct vm_area_struct *vma, unsigned long addr,

		      unsigned long pfn);

void flush_dcache_page(struct page *pg);



#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)



void flush_icache_range(unsigned long start, unsigned long end);

void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,

			     unsigned long addr, int len);