Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 55c5d74b3ac3a6b8bdde4e5fab4015eccd557d52

Authored by Al Viro
Committed by Linus Torvalds
1 parent 06a544971f
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] gfp_t: dma-mapping (alpha) 

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

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

arch/alpha/kernel/pci-noop.c
Diff comments   View file @ 55c5d74
... ... @@ -154,7 +154,7 @@
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  
include/asm-alpha/dma-mapping.h
Diff comments   View file @ 55c5d74
... ... @@ -31,7 +31,7 @@
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