Re: [PATCH] swiotlb: add "dma_attrs" argument to alloc and free,to match dma_map_ops

[David Daney]

On 05/24/2012 04:44 AM, Alessandro Rubini wrote:
> The alloc and free pointers within "struct dma_map_ops" receive a
> pointer to dma_attrs that was not present in the generic swiotlb
> functions.  For this reason, a few files had a local wrapper for the
> free function that just removes the attrs argument before calling the
> generic function.
>
> This patch adds the extra argument to generic functions and removes
> such wrappers when they are no more needed.  This also fixes a
> compiler warning for sta2x11-fixup.c, that would have required yet
> another wrapper.
>
> Signed-off-by: Alessandro Rubini<rubini@xxxxxxxxx>
> Acked-by: Giancarlo Asnaghi<giancarlo.asnaghi@xxxxxx>
> Cc: Tony Luck<tony.luck@xxxxxxxxx>
> Cc: Fenghua Yu<fenghua.yu@xxxxxxxxx>
> Cc: Ralf Baechle<ralf@xxxxxxxxxxxxxx>
> Cc: Guan Xuetao<gxt@xxxxxxxxxxxxxxx>
> Cc: Thomas Gleixner<tglx@xxxxxxxxxxxxx>
> Cc: Kyungmin Park<kyungmin.park@xxxxxxxxxxx>
> Cc: FUJITA Tomonori<fujita.tomonori@xxxxxxxxxxxxx>
> Cc: Konrad Rzeszutek Wilk<konrad.wilk@xxxxxxxxxx>
> ---
>   arch/ia64/kernel/pci-swiotlb.c       |   11 ++---------
>   arch/mips/cavium-octeon/dma-octeon.c |    4 ++--
>   arch/unicore32/mm/dma-swiotlb.c      |   22 ++--------------------
>   arch/x86/kernel/pci-swiotlb.c        |   11 ++---------
>   arch/x86/pci/sta2x11-fixup.c         |    3 ++-
>   include/linux/swiotlb.h              |    7 ++++---
>   lib/swiotlb.c                        |    5 +++--
>   7 files changed, 17 insertions(+), 46 deletions(-)

This looks sane (although I haven't tested it).  For the OCTEON bits:

Acked-by: David Daney <david.daney@xxxxxxxxxx>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/