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

ralfbaechle · ralfbaechle · commit eb37e6ddf75a · 2013-09-06T19:08:25.000+02:00
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)

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,9 @@ static inline struct page dma_addr_to_page(struct device dev,`
`61`	`61`	`static inline int cpu_needs_post_dma_flush(struct device *dev)`
`62`	`62`	`{`
`63`	`63`	`return !plat_device_is_coherent(dev) &&`
`64`		`- (current_cpu_type() == CPU_R10000 \|\|`
`65`		`- current_cpu_type() == CPU_R12000 \|\|`
`66`		`- current_cpu_type() == CPU_BMIPS5000);`
	`64`	`+ (boot_cpu_type() == CPU_R10000 \|\|`
	`65`	`+ boot_cpu_type() == CPU_R12000 \|\|`
	`66`	`+ boot_cpu_type() == CPU_BMIPS5000);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)`