Commit 5fb5cbed authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: dma-mapping (xtensa) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f80aabb0

arch/xtensa/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/asm-xtensa/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -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);