Skip to contentSkip to conversation

ARM: fix build break due to typo in cacheflush.h

PATCH New Anand Gadiyar 2 participants 2 messages Sep 21, 2010 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: fix build break due to typo in cacheflush.h

commit 9d85ac1e6 introduced a small typo. This causes the build to break when CONFIG_CPU_V7 is set and CONFIG_CPU_V6 and CONFIG_SMP_ON_UP are not. (log below)

CC init/main.o
In file included from include/linux/highmem.h:9,

                 from include/linux/pagemap.h:10,
                 from include/linux/mempolicy.h:70,
                 from init/main.c:50:

arch/arm/include/asm/cacheflush.h: In function '__flush_icache_all':
arch/arm/include/asm/cacheflush.h:332: error: implicit declaration of function '__flush_icache_preferred' make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2

---
 arch/arm/include/asm/cacheflush.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/cacheflush.h +1 -1
Index: linux-omap-2.6/arch/arm/include/asm/cacheflush.h
===================================================================
@@ -324,7 +324,7 @@ extern void copy_to_user_page(struct vm_
 #elif __LINUX_ARM_ARCH__ == 6 && defined(CONFIG_ARM_ERRATA_411920)
 #define __flush_icache_preferred	__cpuc_flush_icache_all
 #else
-#define __fluch_icache_preferred	__flush_icache_all_generic
+#define __flush_icache_preferred	__flush_icache_all_generic
 #endif
 
 static inline void __flush_icache_all(void)
#1 lore raw

PATCH 1/1 ARM: fix build break due to typo in cacheflush.h

Quoted 25 lines · Anand Gadiyar

commit 9d85ac1e6 introduced a small typo. This causes the build to break when CONFIG_CPU_V7 is set and CONFIG_CPU_V6 and CONFIG_SMP_ON_UP are not. (log below)

CC init/main.o
In file included from include/linux/highmem.h:9,

                 from include/linux/pagemap.h:10,
                 from include/linux/mempolicy.h:70,
                 from init/main.c:50:

arch/arm/include/asm/cacheflush.h: In function '__flush_icache_all':
arch/arm/include/asm/cacheflush.h:332: error: implicit declaration of function '__flush_icache_preferred' make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2

---
 arch/arm/include/asm/cacheflush.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-omap-2.6/arch/arm/include/asm/cacheflush.h
===================================================================

arch/arm/include/asm/cacheflush.h extern void copy_to_user_page(struct vm_ · line 330

Quoted 8 lines
arch/arm/include/asm/cacheflush.h +1 -1
@@ -324,7 +324,7 @@ extern void copy_to_user_page(struct vm_
 #elif __LINUX_ARM_ARCH__ == 6 && defined(CONFIG_ARM_ERRATA_411920)
 #define __flush_icache_preferred	__cpuc_flush_icache_all
 #else
-#define __fluch_icache_preferred	__flush_icache_all_generic
+#define __flush_icache_preferred	__flush_icache_all_generic
 #endif
 
 static inline void __flush_icache_all(void)

Thanks, will merge that into the original patch with your S-O-B and repost.

Tony