Commit eb37e6dd authored by Ralf Baechle's avatar Ralf Baechle

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

parents 356948f0 d451e734
...@@ -61,9 +61,9 @@ static inline struct page *dma_addr_to_page(struct device *dev, ...@@ -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) static inline int cpu_needs_post_dma_flush(struct device *dev)
{ {
return !plat_device_is_coherent(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) static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment