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

eb37e6dd · Ralf Baechle · 356948f0 · d451e734 · eb37e6dd
Commit eb37e6dd authored Sep 06, 2013 by Ralf Baechle
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

arch/mips/mm/dma-default.c arch/mips/mm/dma-default.c +3 -3

No files found.
--- 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 ||
+	       (boot_cpu_type() == CPU_R10000 ||
-		current_cpu_type() == CPU_R12000 ||
+		boot_cpu_type() == CPU_R12000 ||
-		current_cpu_type() == CPU_BMIPS5000);
+		boot_cpu_type() == CPU_BMIPS5000);
 }
 static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)