diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /arch/powerpc/include/asm/iommu.h | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'arch/powerpc/include/asm/iommu.h')
| -rw-r--r-- | arch/powerpc/include/asm/iommu.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h index 51ecfef8d843..7464c0daddd1 100644 --- a/arch/powerpc/include/asm/iommu.h +++ b/arch/powerpc/include/asm/iommu.h | |||
| @@ -92,13 +92,14 @@ extern void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl, | |||
| 92 | unsigned long mask, gfp_t flag, int node); | 92 | unsigned long mask, gfp_t flag, int node); |
| 93 | extern void iommu_free_coherent(struct iommu_table *tbl, size_t size, | 93 | extern void iommu_free_coherent(struct iommu_table *tbl, size_t size, |
| 94 | void *vaddr, dma_addr_t dma_handle); | 94 | void *vaddr, dma_addr_t dma_handle); |
| 95 | extern dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl, | 95 | extern dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl, |
| 96 | void *vaddr, size_t size, unsigned long mask, | 96 | struct page *page, unsigned long offset, |
| 97 | enum dma_data_direction direction, | 97 | size_t size, unsigned long mask, |
| 98 | struct dma_attrs *attrs); | 98 | enum dma_data_direction direction, |
| 99 | extern void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle, | 99 | struct dma_attrs *attrs); |
| 100 | size_t size, enum dma_data_direction direction, | 100 | extern void iommu_unmap_page(struct iommu_table *tbl, dma_addr_t dma_handle, |
| 101 | struct dma_attrs *attrs); | 101 | size_t size, enum dma_data_direction direction, |
| 102 | struct dma_attrs *attrs); | ||
| 102 | 103 | ||
| 103 | extern void iommu_init_early_pSeries(void); | 104 | extern void iommu_init_early_pSeries(void); |
| 104 | extern void iommu_init_early_iSeries(void); | 105 | extern void iommu_init_early_iSeries(void); |