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<redacted>
Acked-by: Giancarlo Asnaghi<redacted>
Cc: Tony Luck<tony.luck@intel.com>
Cc: Fenghua Yu<redacted>
Cc: Ralf Baechle<redacted>
Cc: Guan Xuetao<redacted>
Cc: Thomas Gleixner<redacted>
Cc: Kyungmin Park<kyungmin.park@samsung.com>
Cc: FUJITA Tomonori<fujita.tomonori@lab.ntt.co.jp>
Cc: Konrad Rzeszutek Wilk<redacted>
---
  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 <redacted>