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

This commit is contained in:
Ralf Baechle 2013-09-06 19:08:25 +02:00
commit eb37e6ddf7

View file

@ -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)