summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/iommu.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-12 17:01:50 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-12 17:01:50 +1000
commit5629d41d5ce255802cd3c350fbadfe5f3aa5f279 (patch)
treee00fcb33fd2e25305b3243e060e01cd346d4af94 /include/asm-powerpc/iommu.h
parent3eac8c69d1ac1266327f4e29deb23716a12c6d30 (diff)
downloadop-kernel-dev-5629d41d5ce255802cd3c350fbadfe5f3aa5f279.zip
op-kernel-dev-5629d41d5ce255802cd3c350fbadfe5f3aa5f279.tar.gz
powerpc: Bring in some changes made to arch/ppc and include/asm-ppc64
Recent commits upstream have changed files which are currently duplicated in arch/powerpc and include/asm-powerpc. This updates them with the corresponding changes. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/iommu.h')
-rw-r--r--include/asm-powerpc/iommu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/iommu.h b/include/asm-powerpc/iommu.h
index d096faf..f80ec8d 100644
--- a/include/asm-powerpc/iommu.h
+++ b/include/asm-powerpc/iommu.h
@@ -88,7 +88,7 @@ extern void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,
int nelems, enum dma_data_direction direction);
extern void *iommu_alloc_coherent(struct iommu_table *tbl, size_t size,
- dma_addr_t *dma_handle, unsigned int __nocast flag);
+ dma_addr_t *dma_handle, gfp_t flag);
extern void iommu_free_coherent(struct iommu_table *tbl, size_t size,
void *vaddr, dma_addr_t dma_handle);
extern dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr,
OpenPOWER on IntegriCloud