* [PATCH] dma-contiguous: fix comment for dma_release_from_contiguous
@ 2020-04-23 16:31 Peter Collingbourne via iommu
2020-04-24 6:54 ` Christoph Hellwig
0 siblings, 1 reply; 2+ messages in thread
From: Peter Collingbourne via iommu @ 2020-04-23 16:31 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: iommu, Peter Collingbourne
Commit 90ae409f9eb3 ("dma-direct: fix zone selection
after an unaddressable CMA allocation") changed the logic in
dma_release_from_contiguous to remove the normal pages fallback path,
but did not update the comment. Fix that.
Signed-off-by: Peter Collingbourne <pcc@google.com>
---
kernel/dma/contiguous.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
index 8bc6f2d670f9..15bc5026c485 100644
--- a/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@ -222,8 +222,8 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages,
* @gfp: Allocation flags.
*
* This function allocates contiguous memory buffer for specified device. It
- * first tries to use device specific contiguous memory area if available or
- * the default global one, then tries a fallback allocation of normal pages.
+ * tries to use device specific contiguous memory area if available, or the
+ * default global one.
*
* Note that it byapss one-page size of allocations from the global area as
* the addresses within one page are always contiguous, so there is no need
--
2.26.2.303.gf8c07b1a785-goog
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dma-contiguous: fix comment for dma_release_from_contiguous
2020-04-23 16:31 [PATCH] dma-contiguous: fix comment for dma_release_from_contiguous Peter Collingbourne via iommu
@ 2020-04-24 6:54 ` Christoph Hellwig
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2020-04-24 6:54 UTC (permalink / raw)
To: Peter Collingbourne; +Cc: iommu, Christoph Hellwig
Thanks,
applied to the dma-mapping for-next branch.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-24 6:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-23 16:31 [PATCH] dma-contiguous: fix comment for dma_release_from_contiguous Peter Collingbourne via iommu
2020-04-24 6:54 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox