aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2005-10-21 03:21:48 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 08:16:49 -0700
commit5fb5cbed6e5ba4cbaf7284a23d42eb878bb7da24 (patch)
treeeac92d644ee7a11538f52017756687a755d48ee5
parentf80aabb03a33702d934fbc3c02fd96471816d82e (diff)
downloadkernel_samsung_espresso10-5fb5cbed6e5ba4cbaf7284a23d42eb878bb7da24.zip
kernel_samsung_espresso10-5fb5cbed6e5ba4cbaf7284a23d42eb878bb7da24.tar.gz
kernel_samsung_espresso10-5fb5cbed6e5ba4cbaf7284a23d42eb878bb7da24.tar.bz2
[PATCH] gfp_t: dma-mapping (xtensa)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/xtensa/kernel/pci-dma.c2
-rw-r--r--include/asm-xtensa/dma-mapping.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
index 84fde25..1ff8226 100644
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
@@ -29,7 +29,7 @@
*/
void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp)
+dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
{
void *ret;
diff --git a/include/asm-xtensa/dma-mapping.h b/include/asm-xtensa/dma-mapping.h
index e86a206..c425f10 100644
--- a/include/asm-xtensa/dma-mapping.h
+++ b/include/asm-xtensa/dma-mapping.h
@@ -28,7 +28,7 @@ extern void consistent_sync(void*, size_t, int);
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
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);
void dma_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle);