Commit a1e81f96 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

m68k: implement flush_icache_user_range 



Rename the current flush_icache_range to flush_icache_user_range as per
commit ae92ef8a ("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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarGeert 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fca7f8e6

arch/m68k/include/asm/cacheflush_mm.h

+2 −0
Original line number Diff line number Diff line
@@ -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,

				    unsigned long addr, int len);

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,

				     struct page *page, unsigned long vaddr,

arch/m68k/mm/cache.c

+6 −1
Original line number Diff line number Diff line
@@ -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 */

/* 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) {

		unsigned long start, end;
@@ -104,6 +104,11 @@ void flush_icache_range(unsigned long address, unsigned long endaddr) 
			      : "di" (FLUSH_I));

	}

}



void flush_icache_range(unsigned long address, unsigned long endaddr)

{

	flush_icache_user_range(address, endaddr);

}

EXPORT_SYMBOL(flush_icache_range);



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE