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

diff --cc arch/mips/mm/dma-default.c
index 468f7f967f973702eb329baa79de816a97854154,2f26835803eb0663110f01f97fad3744690748cb..664e523653d03a4123b69f9d928fb605d2ca4e8d
--- 1/arch/mips/mm/dma-default.c
--- 2/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)