From: Christoph Hellwig Date: Thu, 24 Jun 2021 17:38:19 +0000 (+0200) Subject: dma-mapping: allow using the global coherent pool for !ARM X-Git-Tag: libata-5.15-2021-09-05~18^2~4 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=70d6aa0ecfed253a2b14659a6c77359af6d9b3ee;p=linux-block.git dma-mapping: allow using the global coherent pool for !ARM Switch an ifdef so that the global coherent pool is initialized for any architecture that selects the DMA_GLOBAL_POOL symbol insted of hardcoding ARM. Signed-off-by: Christoph Hellwig Tested-by: Dillon Min --- diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c index 794e76b03b34..67b126afac5a 100644 --- a/kernel/dma/coherent.c +++ b/kernel/dma/coherent.c @@ -361,7 +361,9 @@ static int __init rmem_dma_setup(struct reserved_mem *rmem) pr_err("Reserved memory: regions without no-map are not yet supported\n"); return -EINVAL; } +#endif +#ifdef CONFIG_DMA_GLOBAL_POOL if (of_get_flat_dt_prop(node, "linux,dma-default", NULL)) { WARN(dma_reserved_default_memory, "Reserved memory: region for default DMA coherent area is redefined\n");