Messages in this thread Patch in this message | | | Date | Fri, 22 Feb 2019 16:18:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the rpmsg tree |
| |
Hi Bjorn,
After merging the rpmsg tree, today's linux-next build (arm multi_v7_defconfig) failed like this:
drivers/remoteproc/remoteproc_virtio.c: In function 'rproc_add_virtio_dev': drivers/remoteproc/remoteproc_virtio.c:374:11: error: 'DMA_MEMORY_EXCLUSIVE' undeclared (first use in this function); did you mean 'WQ_FLAG_EXCLUSIVE'? DMA_MEMORY_EXCLUSIVE); ^~~~~~~~~~~~~~~~~~~~ WQ_FLAG_EXCLUSIVE drivers/remoteproc/remoteproc_virtio.c:374:11: note: each undeclared identifier is reported only once for each function it appears in drivers/remoteproc/remoteproc_virtio.c:371:10: error: too many arguments to function 'dma_declare_coherent_memory' ret = dma_declare_coherent_memory(dev, pa, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/remoteproc/remoteproc_virtio.c:20: include/linux/dma-mapping.h:748:5: note: declared here int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr, ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
086d08725d34 ("remoteproc: create vdev subdevice with specific dma memory pool")
interacting with commit
82c5de0ab8db ("dma-mapping: remove the DMA_MEMORY_EXCLUSIVE flag")
from the dma-mapping tree.
I have applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 22 Feb 2019 16:14:45 +1100 Subject: [PATCH] remoteproc: fix for "dma-mapping: remove the DMA_MEMORY_EXCLUSIVE flag"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/remoteproc/remoteproc_virtio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c index 337327d21c1c..44774de6f17b 100644 --- a/drivers/remoteproc/remoteproc_virtio.c +++ b/drivers/remoteproc/remoteproc_virtio.c @@ -370,8 +370,7 @@ int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id) /* Associate vdev buffer memory pool to vdev subdev */ ret = dma_declare_coherent_memory(dev, pa, mem->da, - mem->len, - DMA_MEMORY_EXCLUSIVE); + mem->len); if (ret < 0) { dev_err(dev, "Failed to associate buffer\n"); goto out; -- 2.20.1 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |