The patch titled fix up for dma-add-dma_map_attrs-interfaces and update docs has been added to the -mm tree. Its filename is dma-document-dma_map_attrs-interfaces-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fix up for dma-add-dma_map_attrs-interfaces and update docs From: Mark Nelson <markn@xxxxxxxxxxx> Fix up the documentation for the new dma attrs (still refers to DECLARE_DMA_ATTRS and the arguments to dma_{set,get}_attr() have been swapped around). Signed-off-by: Mark Nelson <markn@xxxxxxxxxxx> Cc: Arthur Kepner <akepner@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/DMA-API.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN Documentation/DMA-API.txt~dma-document-dma_map_attrs-interfaces-fix Documentation/DMA-API.txt --- a/Documentation/DMA-API.txt~dma-document-dma_map_attrs-interfaces-fix +++ a/Documentation/DMA-API.txt @@ -439,8 +439,8 @@ for DMA: * documented in Documentation/DMA-attributes.txt */ ... - DECLARE_DMA_ATTRS(attrs); - dma_set_attr(&attrs, DMA_ATTR_FOO); + DEFINE_DMA_ATTRS(attrs); + dma_set_attr(DMA_ATTR_FOO, &attrs); .... n = dma_map_sg_attrs(dev, sg, nents, DMA_TO_DEVICE, &attr); .... @@ -454,7 +454,7 @@ void whizco_dma_map_sg_attrs(struct devi struct dma_attrs *attrs) { .... - int foo = dma_get_attr(attrs, DMA_ATTR_FOO); + int foo = dma_get_attr(DMA_ATTR_FOO, attrs); .... if (foo) /* twizzle the frobnozzle */ _ Patches currently in -mm which might be from markn@xxxxxxxxxxx are dma-add-dma_map_attrs-interfaces-fix.patch dma-document-dma_map_attrs-interfaces-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html