From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 6 Sep 2013 17:08:25 +0000 (+0200)
Subject: Merge branch '3.11-fixes' into mips-for-linux-next
X-Git-Tag: upstream/snapshot3+hdmi~4311^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb37e6ddf75a3d4c59e38193a7c8d409f5bd7d57;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

eb37e6ddf75a3d4c59e38193a7c8d409f5bd7d57
diff --cc arch/mips/mm/dma-default.c
index 468f7f9,2f26835..664e523
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@@ -58,12 -54,12 +58,12 @@@ static inline struct page *dma_addr_to_
   * MIPS terminology calls memory areas with hardware maintained coherency
   * coherent.
   */
 -
 -static inline int cpu_is_noncoherent_r10000(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_R12000 ||
++		boot_cpu_type() == CPU_BMIPS5000);
  }
  
  static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)