---

yaml --- r: 44699 b: refs/heads/master c: c041ffb h: refs/heads/master i: 44697: e7259c1 44695: 8884341 v: v3
git-mirror · Dec 18, 2006 · f6ba1b5 · f6ba1b5
1 parent 593dfcd
commit f6ba1b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab9d90db956dec1a83f4c4ef443df6bdbfc3f25d
+refs/heads/master: c041ffb36407897bbc3b7bf87d1fa856ce085cdf
diff --git a/trunk/include/asm-arm/arch-ixp23xx/memory.h b/trunk/include/asm-arm/arch-ixp23xx/memory.h
@@ -41,21 +41,7 @@
 	data = *((volatile int *)IXP23XX_PCI_SDRAM_BAR);		\
 	 __phys_to_virt((((b - (data & 0xfffffff0)) + 0x00000000))); })
 
-/*
- * Coherency support.  Only supported on A2 CPUs or on A1
- * systems that have the cache coherency workaround.
- */
-static inline int __ixp23xx_arch_is_coherent(void)
-{
-	extern unsigned int processor_id;
-
-	if (((processor_id & 15) >= 4) || machine_is_roadrunner())
-		return 1;
-
-	return 0;
-}
-
-#define arch_is_coherent()	__ixp23xx_arch_is_coherent()
+#define arch_is_coherent()	1
 
 #endif