Merge branch 'master' into for-2.6.33

2009-12-03 13:49:39 +01:00
parent 474b18ccc2 22763c5cf3
commit 220d0b1dbf
966 changed files with 15377 additions and 7229 deletions
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -415,9 +415,14 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page

 static inline void __flush_icache_all(void)
 {
+#ifdef CONFIG_ARM_ERRATA_411920
+	extern void v6_icache_inval_all(void);
+	v6_icache_inval_all();
+#else
 	asm("mcr	p15, 0, %0, c7, c5, 0	@ invalidate I-cache\n"
 	    :
 	    : "r" (0));
+#endif
 }

 #define ARCH_HAS_FLUSH_ANON_PAGE