On Thu, May 24, 2012 at 01:44:22PM +0200, 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 +++-- So .. what is this based on? I see in mainline alloc_coherent and free_coherent which are obviously changed here. Don't you also need to change these two files: arch/x86/xen/pci-swiotlb-xen.c drivers/xen/swiotlb-xen.c
