aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-10-02 07:21:31 -0700
committerChristoph Hellwig <hch@lst.de>2018-10-02 07:21:31 -0700
commit6db37ad7c27bda2f62d1ef6ad0496e359c562c1a (patch)
tree73ef31c6644acc4ca893aefbb02fee1570728d67 /drivers/base
parentdma-direct: always allow dma mask <= physiscal memory size (diff)
downloadlinux-dev-6db37ad7c27bda2f62d1ef6ad0496e359c562c1a.tar.xz
linux-dev-6db37ad7c27bda2f62d1ef6ad0496e359c562c1a.zip
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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c2
1 files changed, 1 insertions, 1 deletions
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);