diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:21:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:16:48 -0700 |
| commit | 6dae2c2306684d9e76a04c22dc090380a9009f12 (patch) | |
| tree | f15fae33cf83d5e3eb57a3399cd61da59adb1ba5 /include/asm-sh | |
| parent | e82dd4d6472304495afa271b2f63b572868b23d9 (diff) | |
| download | linux-6dae2c2306684d9e76a04c22dc090380a9009f12.tar.gz linux-6dae2c2306684d9e76a04c22dc090380a9009f12.tar.bz2 linux-6dae2c2306684d9e76a04c22dc090380a9009f12.zip | |
[PATCH] gfp_t: dma-mapping (sh)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-sh')
| -rw-r--r-- | include/asm-sh/dma-mapping.h | 4 | ||||
| -rw-r--r-- | include/asm-sh/machvec.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h index 80d164c1529e..d3fa5c2b889d 100644 --- a/include/asm-sh/dma-mapping.h +++ b/include/asm-sh/dma-mapping.h @@ -9,7 +9,7 @@ extern struct bus_type pci_bus_type; /* arch/sh/mm/consistent.c */ -extern void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle); +extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle); extern void consistent_free(void *vaddr, size_t size); extern void consistent_sync(void *vaddr, size_t size, int direction); @@ -26,7 +26,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask) } static inline void *dma_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, int flag) + dma_addr_t *dma_handle, gfp_t flag) { if (sh_mv.mv_consistent_alloc) { void *ret; diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h index 5771f4baa478..3f18aa180516 100644 --- a/include/asm-sh/machvec.h +++ b/include/asm-sh/machvec.h @@ -64,7 +64,7 @@ struct sh_machine_vector void (*mv_heartbeat)(void); - void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, int); + void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, gfp_t); int (*mv_consistent_free)(struct device *, size_t, void *, dma_addr_t); }; |