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

mm: rename flush_icache_user_range to flush_icache_user_page 



The function currently known as flush_icache_user_range only operates on
a single page.  Rename it to flush_icache_user_page as we'll need the
name flush_icache_user_range for something else soon.

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: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20200515143646.3857579-20-hch@lst.de


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97f52c15

arch/alpha/include/asm/cacheflush.h

+5 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ extern void smp_imb(void); 


extern void __load_new_mm_context(struct mm_struct *);

static inline void

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

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

			unsigned long addr, int len)

{

	if (vma->vm_flags & VM_EXEC) {
@@ -46,16 +46,16 @@ flush_icache_user_range(struct vm_area_struct *vma, struct page *page, 
			mm->context[smp_processor_id()] = 0;

	}

}

#define flush_icache_user_range flush_icache_user_range

#define flush_icache_user_page flush_icache_user_page

#else /* CONFIG_SMP */

extern void flush_icache_user_range(struct vm_area_struct *vma,

extern void flush_icache_user_page(struct vm_area_struct *vma,

		struct page *page, unsigned long addr, int len);

#define flush_icache_user_range flush_icache_user_range

#define flush_icache_user_page flush_icache_user_page

#endif /* CONFIG_SMP */



/* This is used only in __do_fault and do_swap_page.  */

#define flush_icache_page(vma, page) \

	flush_icache_user_range((vma), (page), 0, 0)

	flush_icache_user_page((vma), (page), 0, 0)



#include <asm-generic/cacheflush.h>

arch/alpha/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ ipi_flush_icache_page(void *x) 
}



void

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

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

			unsigned long addr, int len)

{

	struct mm_struct *mm = vma->vm_mm;

arch/ia64/include/asm/cacheflush.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ extern void flush_icache_range(unsigned long start, unsigned long end); 
#define flush_icache_range flush_icache_range

extern void clflush_cache_range(void *addr, int size);



#define flush_icache_user_range(vma, page, user_addr, len)					\

#define flush_icache_user_page(vma, page, user_addr, len)					\

do {												\

	unsigned long _addr = (unsigned long) page_address(page) + ((user_addr) & ~PAGE_MASK);	\

	flush_icache_range(_addr, _addr + (len));						\

arch/m68k/include/asm/cacheflush_mm.h

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static inline void __flush_page_to_ram(void *vaddr) 
#define flush_dcache_mmap_unlock(mapping)	do { } while (0)

#define flush_icache_page(vma, page)	__flush_page_to_ram(page_address(page))



extern void flush_icache_user_range(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);

extern void flush_icache_range(unsigned long address, unsigned long endaddr);
@@ -264,7 +264,7 @@ static inline void copy_to_user_page(struct vm_area_struct *vma, 
{

	flush_cache_page(vma, vaddr, page_to_pfn(page));

	memcpy(dst, src, len);

	flush_icache_user_range(vma, page, vaddr, len);

	flush_icache_user_page(vma, page, vaddr, len);

}

static inline void copy_from_user_page(struct vm_area_struct *vma,

				       struct page *page, unsigned long vaddr,

arch/m68k/mm/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void flush_icache_range(unsigned long address, unsigned long endaddr) 
}

EXPORT_SYMBOL(flush_icache_range);



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

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

			     unsigned long addr, int len)

{

	if (CPU_IS_COLDFIRE) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE