--- zzzz-none-000/linux-2.6.28.10/arch/mips/mm/dma-default.c	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/mips/mm/dma-default.c	2010-03-24 12:57:05.000000000 +0000
@@ -35,9 +35,10 @@
 
 static inline int cpu_is_noncoherent_r10000(struct device *dev)
 {
-	return !plat_device_is_coherent(dev) &&
-	       (current_cpu_type() == CPU_R10000 ||
-	       current_cpu_type() == CPU_R12000);
+	return !plat_device_is_coherent(dev);
+           /*--- && ---*/
+	       /*--- (current_cpu_type() == CPU_R10000 || ---*/
+	       /*--- current_cpu_type() == CPU_R12000); ---*/
 }
 
 static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)