xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m68k: implement flush_icache_user_range

Browse Source 
Rename the current flush_icache_range to flush_icache_user_range as per
commit ae92ef8a44 ("PATCH] flush icache in correct context") there
seems to be an assumption that it operates on user addresses.  Add a
flush_icache_range around it that for now is a no-op.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Link: http://lkml.kernel.org/r/20200515143646.3857579-25-hch@lst.de
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig
2020-06-07 21:42:37 -07:00
committed by Linus Torvalds
parent fca7f8e6fd
commit a1e81f9654
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/include/asm/cacheflush_mm.h
View File

@@ -257,6 +257,8 @@ static inline void __flush_page_to_ram(void *vaddr)
extern void flush_icache_user_page(struct vm_area_struct *vma, struct page *page, extern void flush_icache_user_page(struct vm_area_struct *vma, struct page *page,
unsigned long addr, int len); unsigned long addr, int len);
extern void flush_icache_range(unsigned long address, unsigned long endaddr); extern void flush_icache_range(unsigned long address, unsigned long endaddr);
extern void flush_icache_user_range(unsigned long address,
unsigned long endaddr);
static inline void copy_to_user_page(struct vm_area_struct *vma, static inline void copy_to_user_page(struct vm_area_struct *vma,
struct page *page, unsigned long vaddr, struct page *page, unsigned long vaddr,

7
arch/m68k/mm/cache.c
View File

@@ -73,7 +73,7 @@ static unsigned long virt_to_phys_slow(unsigned long vaddr)
/* Push n pages at kernel virtual address and clear the icache */ /* Push n pages at kernel virtual address and clear the icache */
/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */ /* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
void flush_icache_range(unsigned long address, unsigned long endaddr) void flush_icache_user_range(unsigned long address, unsigned long endaddr)
{ {
if (CPU_IS_COLDFIRE) { if (CPU_IS_COLDFIRE) {
unsigned long start, end; unsigned long start, end;
@@ -104,6 +104,11 @@ void flush_icache_range(unsigned long address, unsigned long endaddr)
: "di" (FLUSH_I)); : "di" (FLUSH_I));
} }
} }
void flush_icache_range(unsigned long address, unsigned long endaddr)
{
flush_icache_user_range(address, endaddr);
}
EXPORT_SYMBOL(flush_icache_range); EXPORT_SYMBOL(flush_icache_range);
void flush_icache_user_page(struct vm_area_struct *vma, struct page *page, void flush_icache_user_page(struct vm_area_struct *vma, struct page *page,