evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ralf Baechle 2013-09-06 19:08:25 +02:00
commit eb37e6ddf7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/mips/mm/dma-default.c
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) 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)