Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb37e6dd authored by Ralf Baechle's avatar Ralf Baechle
Browse files

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

parents 356948f0 d451e734

arch/mips/mm/dma-default.c

+3 −3
Original line number Diff line number Diff line
@@ -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)