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

[PATCH] gfp_t: dma-mapping (alpha)

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
55c5d74b 06a54497

+2 -2
+1 -1
arch/alpha/kernel/pci-noop.c
··· 154 154 155 155 void * 156 156 dma_alloc_coherent(struct device *dev, size_t size, 157 - dma_addr_t *dma_handle, int gfp) 157 + dma_addr_t *dma_handle, gfp_t gfp) 158 158 { 159 159 void *ret; 160 160
+1 -1
include/asm-alpha/dma-mapping.h
··· 31 31 #else /* no PCI - no IOMMU. */ 32 32 33 33 void *dma_alloc_coherent(struct device *dev, size_t size, 34 - dma_addr_t *dma_handle, int gfp); 34 + dma_addr_t *dma_handle, gfp_t gfp); 35 35 int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, 36 36 enum dma_data_direction direction); 37 37