summaryrefslogtreecommitdiffstats
path: root/arch/mips/mm
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-09-06 19:08:25 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-09-06 19:08:25 +0200
commiteb37e6ddf75a3d4c59e38193a7c8d409f5bd7d57 (patch)
treed856689814a1af27e65a445bd69e9f816ee62a7a /arch/mips/mm
parent356948f042c59d94dc6700455263b7739f09e6b0 (diff)
parentd451e73496fc389ecbe2662aa07e6b77c63bf1fd (diff)
downloadop-kernel-dev-eb37e6ddf75a3d4c59e38193a7c8d409f5bd7d57.zip
op-kernel-dev-eb37e6ddf75a3d4c59e38193a7c8d409f5bd7d57.tar.gz
Merge branch '3.11-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/mm')
-rw-r--r--arch/mips/mm/dma-default.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 468f7f9..664e5236 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -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)
OpenPOWER on IntegriCloud