diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 00:35:26 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-17 00:35:26 +0100 |
| commit | bd1274dc005c2cee41771a7cc616f4709a6e6323 (patch) | |
| tree | fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca /arch/arm/include/asm/cacheflush.h | |
| parent | Merge branch 'misc' into devel (diff) | |
| parent | ARM: 6653/1: bitops: Use BX instead of MOV PC,LR (diff) | |
| download | linux-bd1274dc005c2cee41771a7cc616f4709a6e6323.tar.xz linux-bd1274dc005c2cee41771a7cc616f4709a6e6323.zip | |
Merge branch 'v6v7' into devel
Conflicts:
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/include/asm/cacheflush.h')
| -rw-r--r-- | arch/arm/include/asm/cacheflush.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 18a56640d97d..d5d8d5c72682 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -187,7 +187,8 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *, * Optimized __flush_icache_all for the common cases. Note that UP ARMv7 * will fall through to use __flush_icache_all_generic. */ -#if (defined(CONFIG_CPU_V7) && defined(CONFIG_CPU_V6)) || \ +#if (defined(CONFIG_CPU_V7) && \ + (defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K))) || \ defined(CONFIG_SMP_ON_UP) #define __flush_icache_preferred __cpuc_flush_icache_all #elif __LINUX_ARM_ARCH__ >= 7 && defined(CONFIG_SMP) |