From: Christoph Hellwig <hch@lst.de>
Date: Tue, 2 Oct 2018 14:21:31 +0000 (-0700)
Subject: dma-mapping: move dma_default_get_required_mask under ifdef
X-Git-Tag: microblaze-v5.0-rc1~115^2~15
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=6db37ad7c27bda2f62d1ef6ad0496e359c562c1a;p=linux-2.6-microblaze.git

dma-mapping: move dma_default_get_required_mask under ifdef

This avoids a warning on powerpc.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index cfe22fded980..23cf4427f425 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1179,6 +1179,7 @@ int __init platform_bus_init(void)
 	return error;
 }
 
+#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK
 static u64 dma_default_get_required_mask(struct device *dev)
 {
 	u32 low_totalram = ((max_pfn - 1) << PAGE_SHIFT);
@@ -1198,7 +1199,6 @@ static u64 dma_default_get_required_mask(struct device *dev)
 	return mask;
 }
 
-#ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK
 u64 dma_get_required_mask(struct device *dev)
 {
 	const struct dma_map_ops *ops = get_dma_ops(dev);