From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Takashi Iwai <tiwai@suse.de>, Christoph Hellwig <hch@lst.de>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the sound tree
Date: Fri, 17 Jul 2020 13:01:12 +1000 [thread overview]
Message-ID: <20200717130112.469f8f8f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1720 bytes --]
Hi all,
After merging the sound tree, today's linux-next build (x86_64
allmodconfig) failed like this:
sound/core/pcm_memory.c: In function 'do_alloc_pages':
sound/core/pcm_memory.c:47:7: error: implicit declaration of function 'dma_is_direct'; did you mean 'd_is_dir'? [-Werror=implicit-function-declaration]
47 | !dma_is_direct(get_dma_ops(dev))) {
| ^~~~~~~~~~~~~
| d_is_dir
Caused by commit
3ad796cbc36a ("ALSA: pcm: Use SG-buffer only when direct DMA is available")
interacting with commit
d3fa60d7bfdc ("dma-mapping: move the remaining DMA API calls out of line")
from the dma-mapping tree.
I am not sure of the best fix here, so I just added this hack to make
it build for now. Suggestions welcome.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 17 Jul 2020 12:57:38 +1000
Subject: [PATCH] merge fix for dma_is_direct() removal
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
sound/core/pcm_memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index 795af1b88051..89480f12086a 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -44,7 +44,7 @@ static int do_alloc_pages(struct snd_card *card, int type, struct device *dev,
#ifdef CONFIG_SND_DMA_SGBUF
if ((type == SNDRV_DMA_TYPE_DEV_SG || type == SNDRV_DMA_TYPE_DEV_UC_SG) &&
- !dma_is_direct(get_dma_ops(dev))) {
+ 1 /* !dma_is_direct(get_dma_ops(dev)) */) {
/* mutate to continuous page allocation */
dev_dbg(dev, "Use continuous page allocator\n");
if (type == SNDRV_DMA_TYPE_DEV_SG)
--
2.27.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-07-17 3:01 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 3:01 Stephen Rothwell [this message]
2020-07-17 5:33 ` linux-next: build failure after merge of the sound tree Christoph Hellwig
2020-07-17 6:34 ` Takashi Iwai
2020-07-17 6:50 ` Christoph Hellwig
2020-07-17 6:54 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2023-08-18 3:12 Stephen Rothwell
2023-08-18 11:47 ` Takashi Iwai
2023-05-24 3:54 Stephen Rothwell
2023-05-24 7:14 ` Takashi Iwai
2022-07-15 12:44 Stephen Rothwell
2022-07-15 14:41 ` Takashi Iwai
2022-07-15 19:09 ` Andy Shevchenko
2021-10-18 0:38 Stephen Rothwell
2021-10-18 6:35 ` Takashi Iwai
2019-08-09 2:54 Stephen Rothwell
2019-08-09 5:55 ` Takashi Iwai
2017-05-17 1:29 Stephen Rothwell
2017-05-17 5:30 ` Takashi Iwai
2011-09-23 2:49 Stephen Rothwell
2011-09-23 5:21 ` Takashi Iwai
2011-05-19 1:15 Stephen Rothwell
2010-09-23 2:44 Stephen Rothwell
2010-09-23 6:04 ` Takashi Iwai
2010-09-23 8:39 ` Mark Brown
2010-06-24 3:03 Stephen Rothwell
2010-06-24 6:11 ` Takashi Iwai
2010-06-28 16:33 ` Daniel Mack
2010-06-01 2:30 Stephen Rothwell
2010-06-01 5:47 ` Takashi Iwai
2010-04-07 3:39 Stephen Rothwell
2010-04-07 6:06 ` Takashi Iwai
2010-04-07 7:16 ` Stephen Rothwell
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=20200717130112.469f8f8f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tiwai@suse.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.