diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-03 10:30:58 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-07-08 11:32:21 +0100 |
| commit | 5ccd3bd992cf668b5a6fa1713da7b443a35e2930 (patch) | |
| tree | e55f60946cf658ab396a1a0401833b67e71de196 /arch/arm/include/asm/cacheflush.h | |
| parent | c5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d (diff) | |
| parent | f785b42f4cb5a63eeb3f9037acf35b827aabb328 (diff) | |
Merge branches 'fixes' and 'misc'
Fix up the conflict between "VDSO: Drop implicit common-page-size
linker flag" and "vdso: pass --be8 to linker if necessary"
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/cacheflush.h')
| -rw-r--r-- | arch/arm/include/asm/cacheflush.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index ec1a5fd0d294..ec4fd2e2dd60 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -479,4 +479,11 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size) void flush_uprobe_xol_access(struct page *page, unsigned long uaddr, void *kaddr, unsigned long len); + +#ifdef CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND +void check_cpu_icache_size(int cpuid); +#else +static inline void check_cpu_icache_size(int cpuid) { } +#endif + #endif |