diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:21:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 11:16:47 -0400 |
commit | 06a544971fad0992fe8b92c5647538d573089dd4 (patch) | |
tree | b51e38c66fcf65d4023a5627228861bd061c9c5c /arch/ia64/hp | |
parent | f9e3214a7964f523e12b4f30b6bd6396794818bd (diff) |
[PATCH] gfp_t: dma-mapping (ia64)
... and related annotations for amd64 - swiotlb code is shared, but
prototypes are not.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ia64/hp')
-rw-r--r-- | arch/ia64/hp/common/hwsw_iommu.c | 2 | ||||
-rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c index 80f8ef013939..1ba02baf2f94 100644 --- a/arch/ia64/hp/common/hwsw_iommu.c +++ b/arch/ia64/hp/common/hwsw_iommu.c | |||
@@ -71,7 +71,7 @@ hwsw_init (void) | |||
71 | } | 71 | } |
72 | 72 | ||
73 | void * | 73 | void * |
74 | hwsw_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flags) | 74 | hwsw_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) |
75 | { | 75 | { |
76 | if (use_swiotlb(dev)) | 76 | if (use_swiotlb(dev)) |
77 | return swiotlb_alloc_coherent(dev, size, dma_handle, flags); | 77 | return swiotlb_alloc_coherent(dev, size, dma_handle, flags); |
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 11957598a8b9..21bffba78b6d 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -1076,7 +1076,7 @@ void sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, int dir) | |||
1076 | * See Documentation/DMA-mapping.txt | 1076 | * See Documentation/DMA-mapping.txt |
1077 | */ | 1077 | */ |
1078 | void * | 1078 | void * |
1079 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flags) | 1079 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) |
1080 | { | 1080 | { |
1081 | struct ioc *ioc; | 1081 | struct ioc *ioc; |
1082 | void *addr; | 1082 | void *addr; |