summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-09-26 09:48:02 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-09-27 11:13:54 +0200
commit857f60c1c6b588588508e52c4270007fe74fa6ec (patch)
treeb381ec5ea6ed9071439737171492a7603d69edac /arch/arm
parentd9d88763f53e741a089241beff46b502d28c7765 (diff)
downloadbarebox-857f60c1c6b588588508e52c4270007fe74fa6ec.tar.gz
barebox-857f60c1c6b588588508e52c4270007fe74fa6ec.tar.xz
ARM: rename flush_icache to icache_invalidate
flush_icache is a misnomer since the icache is invalidated, not flushed. Rename the function accordingly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/common.c2
-rw-r--r--arch/arm/cpu/cpu.c2
-rw-r--r--arch/arm/cpu/start-pbl.c2
-rw-r--r--arch/arm/cpu/uncompress.c2
-rw-r--r--arch/arm/include/asm/cache.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c
index dcd8f0b732..7d749967e1 100644
--- a/arch/arm/cpu/common.c
+++ b/arch/arm/cpu/common.c
@@ -63,7 +63,7 @@ void relocate_to_current_adr(void)
memset(dynsym, 0, (unsigned long)dynend - (unsigned long)dynsym);
arm_early_mmu_cache_flush();
- flush_icache();
+ icache_invalidate();
}
#ifdef ARM_MULTIARCH
diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c
index b4804634b7..bf604fd60d 100644
--- a/arch/arm/cpu/cpu.c
+++ b/arch/arm/cpu/cpu.c
@@ -103,7 +103,7 @@ static void arch_shutdown(void)
#ifdef CONFIG_MMU
mmu_disable();
#endif
- flush_icache();
+ icache_invalidate();
#if __LINUX_ARM_ARCH__ <= 7
/*
diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c
index 5f1469bb3e..e851b4a2da 100644
--- a/arch/arm/cpu/start-pbl.c
+++ b/arch/arm/cpu/start-pbl.c
@@ -93,7 +93,7 @@ __noreturn void barebox_single_pbl_start(unsigned long membase,
pbl_barebox_uncompress((void*)barebox_base, (void *)pg_start, pg_len);
arm_early_mmu_cache_flush();
- flush_icache();
+ icache_invalidate();
if (IS_ENABLED(CONFIG_THUMB2_BAREBOX))
barebox = (void *)(barebox_base + 1);
diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c
index eeb5a65439..9d7fe0e921 100644
--- a/arch/arm/cpu/uncompress.c
+++ b/arch/arm/cpu/uncompress.c
@@ -100,7 +100,7 @@ void __noreturn barebox_multi_pbl_start(unsigned long membase,
pbl_barebox_uncompress((void*)barebox_base, pg_start, pg_len);
arm_early_mmu_cache_flush();
- flush_icache();
+ icache_invalidate();
if (IS_ENABLED(CONFIG_THUMB2_BAREBOX))
barebox = (void *)(barebox_base + 1);
diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
index 8fcdb64f74..b5460a7876 100644
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
@@ -6,7 +6,7 @@ extern void v8_invalidate_icache_all(void);
extern void v8_dcache_all(void);
#endif
-static inline void flush_icache(void)
+static inline void icache_invalidate(void)
{
#if __LINUX_ARM_ARCH__ <= 7
asm volatile("mcr p15, 0, %0, c7, c5, 0" : : "r" (0));