]> err.no Git - linux-2.6/commit
powerpc/dma: Add struct iommu_table argument to iommu_map_sg()
authorMark Nelson <markn@au1.ibm.com>
Fri, 4 Jul 2008 19:05:41 +0000 (05:05 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 Jul 2008 06:30:43 +0000 (16:30 +1000)
commitc8692362db3db3a6f644e05a477161d967430aac
treeb240cfe972dda9768fc330458da5667a7c15864f
parentfabb657005edbbcb0d13ee49a40f1f4b042a1d19
powerpc/dma: Add struct iommu_table argument to iommu_map_sg()

Make iommu_map_sg take a struct iommu_table. It did so before commit
740c3ce66700640a6e6136ff679b067e92125794 (iommu sg merging: ppc: make
iommu respect the segment size limits).

This stops the function looking in the archdata.dma_data for the iommu
table because in the future it will be called with a device that has
no table there.

This also has the nice side effect of making iommu_map_sg() match the
other map functions.

Signed-off-by: Mark Nelson <markn@au1.ibm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/dma_64.c
arch/powerpc/kernel/iommu.c
include/asm-powerpc/iommu.h