From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Andersson <bjorn.andersson@linaro.org>,
Christoph Hellwig <hch@lst.de>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Loic Pallardy <loic.pallardy@st.com>
Subject: linux-next: build failure after merge of the rpmsg tree
Date: Fri, 22 Feb 2019 16:18:17 +1100 [thread overview]
Message-ID: <20190222161817.32e35462@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2290 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-02-22 5:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 5:18 Stephen Rothwell [this message]
2019-02-22 12:50 ` linux-next: build failure after merge of the rpmsg tree Christoph Hellwig
2019-02-22 14:02 ` Loic PALLARDY
-- strict thread matches above, loose matches on Subject: below --
2023-01-27 7:02 Stephen Rothwell
2023-01-30 8:51 ` Joerg Roedel
2020-10-15 4:55 Stephen Rothwell
2018-04-26 3:33 Stephen Rothwell
2018-04-26 3:46 ` Bjorn Andersson
2017-08-31 6:54 Stephen Rothwell
2017-08-31 17:47 ` Bjorn Andersson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190222161817.32e35462@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bjorn.andersson@linaro.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=loic.pallardy@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).