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

[PATCH] gfp_t: dma-mapping (amd64)

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
f80aabb0 6dae2c23

+4 -4
+2 -2
arch/x86_64/kernel/pci-gart.c
··· 187 187 188 188 /* Allocate DMA memory on node near device */ 189 189 noinline 190 - static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order) 190 + static void *dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order) 191 191 { 192 192 struct page *page; 193 193 int node; ··· 204 204 */ 205 205 void * 206 206 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 207 - unsigned gfp) 207 + gfp_t gfp) 208 208 { 209 209 void *memory; 210 210 unsigned long dma_mask = 0;
+1 -1
arch/x86_64/kernel/pci-nommu.c
··· 24 24 */ 25 25 26 26 void *dma_alloc_coherent(struct device *hwdev, size_t size, 27 - dma_addr_t *dma_handle, unsigned gfp) 27 + dma_addr_t *dma_handle, gfp_t gfp) 28 28 { 29 29 void *ret; 30 30 u64 mask;
+1 -1
include/asm-x86_64/dma-mapping.h
··· 17 17 (swiotlb ? swiotlb_dma_mapping_error(x) : ((x) == bad_dma_address)) 18 18 19 19 void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 20 - unsigned gfp); 20 + gfp_t gfp); 21 21 void dma_free_coherent(struct device *dev, size_t size, void *vaddr, 22 22 dma_addr_t dma_handle); 23 23