Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] gfp_t: dma-mapping (cris)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Al Viro and committed by
Linus Torvalds
43b7eae1 55c5d74b

+2 -2
+2 -2
include/asm-cris/dma-mapping.h
··· 15 15 16 16 #ifdef CONFIG_PCI 17 17 void *dma_alloc_coherent(struct device *dev, size_t size, 18 - dma_addr_t *dma_handle, int flag); 18 + dma_addr_t *dma_handle, gfp_t flag); 19 19 20 20 void dma_free_coherent(struct device *dev, size_t size, 21 21 void *vaddr, dma_addr_t dma_handle); 22 22 #else 23 23 static inline void * 24 24 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 25 - int flag) 25 + gfp_t flag) 26 26 { 27 27 BUG(); 28 28 return NULL;