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 08:16:47 -0700 |
| commit | 06a544971fad0992fe8b92c5647538d573089dd4 (patch) | |
| tree | b51e38c66fcf65d4023a5627228861bd061c9c5c /include/asm-x86_64 | |
| parent | f9e3214a7964f523e12b4f30b6bd6396794818bd (diff) | |
| download | blackbird-op-linux-06a544971fad0992fe8b92c5647538d573089dd4.tar.gz blackbird-op-linux-06a544971fad0992fe8b92c5647538d573089dd4.zip | |
[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 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/swiotlb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/swiotlb.h b/include/asm-x86_64/swiotlb.h index 36293061f4ed..7cbfd10ecc3c 100644 --- a/include/asm-x86_64/swiotlb.h +++ b/include/asm-x86_64/swiotlb.h @@ -27,7 +27,7 @@ extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents, int direction); extern int swiotlb_dma_mapping_error(dma_addr_t dma_addr); extern void *swiotlb_alloc_coherent (struct device *hwdev, size_t size, - dma_addr_t *dma_handle, int flags); + dma_addr_t *dma_handle, gfp_t flags); extern void swiotlb_free_coherent (struct device *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle); |
