diff options
author | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
commit | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch) | |
tree | f0816c90ae937a159f8bfec6018a6271223b954a /include/asm-parisc | |
parent | e0f998930eb67c49f2862c58a45262ad0bc03eca (diff) | |
parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) | |
download | linux-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.gz |
Auto-update from upstream
Diffstat (limited to 'include/asm-parisc')
-rw-r--r-- | include/asm-parisc/dma-mapping.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-parisc/dma-mapping.h b/include/asm-parisc/dma-mapping.h index 4db84f969e9e..74d4ac6f2151 100644 --- a/include/asm-parisc/dma-mapping.h +++ b/include/asm-parisc/dma-mapping.h @@ -9,8 +9,8 @@ /* See Documentation/DMA-mapping.txt */ struct hppa_dma_ops { int (*dma_supported)(struct device *dev, u64 mask); - void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, int flag); - void *(*alloc_noncoherent)(struct device *dev, size_t size, dma_addr_t *iova, int flag); + void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag); + void *(*alloc_noncoherent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag); void (*free_consistent)(struct device *dev, size_t size, void *vaddr, dma_addr_t iova); dma_addr_t (*map_single)(struct device *dev, void *addr, size_t size, enum dma_data_direction direction); void (*unmap_single)(struct device *dev, dma_addr_t iova, size_t size, enum dma_data_direction direction); @@ -49,14 +49,14 @@ extern struct hppa_dma_ops *hppa_dma_ops; static inline void * dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, - int flag) + gfp_t flag) { return hppa_dma_ops->alloc_consistent(dev, size, dma_handle, flag); } static inline void * dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle, - int flag) + gfp_t flag) { return hppa_dma_ops->alloc_noncoherent(dev, size, dma_handle, flag); } |