From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoph Hellwig <hch@lst•de>
Cc: Michael Kelley <mhklinux@outlook•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the dma-mapping tree
Date: Wed, 10 Jul 2024 11:05:45 +1000 [thread overview]
Message-ID: <20240710110545.110366a4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1556 bytes --]
Hi all,
After merging the dma-mapping tree, today's linux-next build (x86_64
allmodconfig) failed like this:
kernel/dma/swiotlb.c: In function 'swiotlb_alloc':
kernel/dma/swiotlb.c:1770:17: error: too few arguments to function 'swiotlb_release_slots'
1770 | swiotlb_release_slots(dev, tlb_addr);
| ^~~~~~~~~~~~~~~~~~~~~
kernel/dma/swiotlb.c:1443:13: note: declared here
1443 | static void swiotlb_release_slots(struct device *dev, phys_addr_t tlb_addr,
| ^~~~~~~~~~~~~~~~~~~~~
Caused by commit
b21a42af002d ("swiotlb: reduce swiotlb pool lookups")
I applied the following patch (which may or may not be correct):
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 10 Jul 2024 10:39:48 +1000
Subject: [PATCH] fixup for "swiotlb: reduce swiotlb pool lookups"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
kernel/dma/swiotlb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 618602fd10df..b4d8167b2f8d 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -1767,7 +1767,7 @@ struct page *swiotlb_alloc(struct device *dev, size_t size)
if (unlikely(!PAGE_ALIGNED(tlb_addr))) {
dev_WARN_ONCE(dev, 1, "Cannot allocate pages from non page-aligned swiotlb addr 0x%pa.\n",
&tlb_addr);
- swiotlb_release_slots(dev, tlb_addr);
+ swiotlb_release_slots(dev, tlb_addr, pool);
return NULL;
}
--
2.43.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-07-10 1:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 1:05 Stephen Rothwell [this message]
2024-07-10 5:58 ` linux-next: build failure after merge of the dma-mapping tree Christoph Hellwig
[not found] <CGME20260327200715eucas1p1953ce4c0b4d4e0cd95844f0acdb7ac3a@eucas1p1.samsung.com>
2026-03-27 20:07 ` Mark Brown
2026-03-30 7:56 ` Marek Szyprowski
2026-03-30 8:11 ` Maxime Ripard
-- strict thread matches above, loose matches on Subject: below --
2024-05-07 23:16 Stephen Rothwell
2024-05-08 6:51 ` Christoph Hellwig
2024-05-08 8:51 ` Alexander Lobakin
2024-05-08 13:45 ` Christoph Hellwig
2020-11-27 6:58 Stephen Rothwell
2020-11-27 9:21 ` Christoph Hellwig
2020-11-27 9:59 ` Stephen Rothwell
2020-11-27 9:33 ` Christoph Hellwig
2012-02-13 5:40 Stephen Rothwell
2012-02-13 7:31 ` Kyungmin Park
2012-02-13 15:05 ` Marek Szyprowski
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=20240710110545.110366a4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhklinux@outlook$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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