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

[PATCH] gfp_t: dma-mapping (simple cases)

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 970a9e73 5fb5cbed

+6 -6
+1 -1
include/asm-generic/dma-mapping-broken.h
··· 6 6 7 7 static inline void * 8 8 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 9 - int flag) 9 + gfp_t flag) 10 10 { 11 11 BUG(); 12 12 return NULL;
+1 -1
include/asm-m32r/dma-mapping.h
··· 8 8 9 9 static inline void * 10 10 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 11 - int flag) 11 + gfp_t flag) 12 12 { 13 13 return (void *)NULL; 14 14 }
+1 -1
include/asm-sh64/dma-mapping.h
··· 25 25 } 26 26 27 27 static inline void *dma_alloc_coherent(struct device *dev, size_t size, 28 - dma_addr_t *dma_handle, int flag) 28 + dma_addr_t *dma_handle, gfp_t flag) 29 29 { 30 30 return consistent_alloc(NULL, size, dma_handle); 31 31 }
+1 -1
include/asm-sparc/dma-mapping.h
··· 8 8 #else 9 9 10 10 static inline void *dma_alloc_coherent(struct device *dev, size_t size, 11 - dma_addr_t *dma_handle, int flag) 11 + dma_addr_t *dma_handle, gfp_t flag) 12 12 { 13 13 BUG(); 14 14 return NULL;
+1 -1
include/asm-sparc64/dma-mapping.h
··· 10 10 struct device; 11 11 12 12 static inline void *dma_alloc_coherent(struct device *dev, size_t size, 13 - dma_addr_t *dma_handle, int flag) 13 + dma_addr_t *dma_handle, gfp_t flag) 14 14 { 15 15 BUG(); 16 16 return NULL;
+1 -1
include/asm-um/dma-mapping.h
··· 19 19 20 20 static inline void * 21 21 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 22 - int flag) 22 + gfp_t flag) 23 23 { 24 24 BUG(); 25 25 return((void *) 0);