Merge branch '3.11-fixes' into mips-for-linux-next

mariux64 · Sep 6, 2013 · eb37e6d · eb37e6d
2 parents 356948f + d451e73
commit eb37e6d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
@@ -61,9 +61,9 @@ static inline struct page *dma_addr_to_page(struct device *dev,
 static inline int cpu_needs_post_dma_flush(struct device *dev)
 {
 	return !plat_device_is_coherent(dev) &&
-	       (current_cpu_type() == CPU_R10000 ||
-		current_cpu_type() == CPU_R12000 ||
-		current_cpu_type() == CPU_BMIPS5000);
+	       (boot_cpu_type() == CPU_R10000 ||
+		boot_cpu_type() == CPU_R12000 ||
+		boot_cpu_type() == CPU_BMIPS5000);
 }
 
 static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)