Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 185a8ff52875d8db31b9346ab186f75baa616dee

Authored by Al Viro
Committed by Linus Torvalds
1 parent a5da7d3c6e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] gfp_t: dma-mapping (mips) 

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

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

arch/mips/mm/dma-coherent.c
Diff comments   View file @ 185a8ff
... ... @@ -18,7 +18,7 @@
18 18 #include <asm/io.h>
19 19  
20 20 void *dma_alloc_noncoherent(struct device *dev, size_t size,
21   - dma_addr_t * dma_handle, int gfp)
  21 + dma_addr_t * dma_handle, gfp_t gfp)
22 22 {
23 23 void *ret;
24 24 /* ignore region specifiers */
... ... @@ -39,7 +39,7 @@
39 39 EXPORT_SYMBOL(dma_alloc_noncoherent);
40 40  
41 41 void *dma_alloc_coherent(struct device *dev, size_t size,
42   - dma_addr_t * dma_handle, int gfp)
  42 + dma_addr_t * dma_handle, gfp_t gfp)
43 43 __attribute__((alias("dma_alloc_noncoherent")));
44 44  
45 45 EXPORT_SYMBOL(dma_alloc_coherent);
arch/mips/mm/dma-ip27.c
Diff comments   View file @ 185a8ff
... ... @@ -22,7 +22,7 @@
22 22 pdev_to_baddr(to_pci_dev(dev), (addr))
23 23  
24 24 void *dma_alloc_noncoherent(struct device *dev, size_t size,
25   - dma_addr_t * dma_handle, int gfp)
  25 + dma_addr_t * dma_handle, gfp_t gfp)
26 26 {
27 27 void *ret;
28 28  
... ... @@ -44,7 +44,7 @@
44 44 EXPORT_SYMBOL(dma_alloc_noncoherent);
45 45  
46 46 void *dma_alloc_coherent(struct device *dev, size_t size,
47   - dma_addr_t * dma_handle, int gfp)
  47 + dma_addr_t * dma_handle, gfp_t gfp)
48 48 __attribute__((alias("dma_alloc_noncoherent")));
49 49  
50 50 EXPORT_SYMBOL(dma_alloc_coherent);
arch/mips/mm/dma-ip32.c
Diff comments   View file @ 185a8ff
... ... @@ -37,7 +37,7 @@
37 37 #define RAM_OFFSET_MASK 0x3fffffff
38 38  
39 39 void *dma_alloc_noncoherent(struct device *dev, size_t size,
40   - dma_addr_t * dma_handle, int gfp)
  40 + dma_addr_t * dma_handle, gfp_t gfp)
41 41 {
42 42 void *ret;
43 43 /* ignore region specifiers */
... ... @@ -61,7 +61,7 @@
61 61 EXPORT_SYMBOL(dma_alloc_noncoherent);
62 62  
63 63 void *dma_alloc_coherent(struct device *dev, size_t size,
64   - dma_addr_t * dma_handle, int gfp)
  64 + dma_addr_t * dma_handle, gfp_t gfp)
65 65 {
66 66 void *ret;
67 67  
arch/mips/mm/dma-noncoherent.c
Diff comments   View file @ 185a8ff
... ... @@ -24,7 +24,7 @@
24 24 */
25 25  
26 26 void *dma_alloc_noncoherent(struct device *dev, size_t size,
27   - dma_addr_t * dma_handle, int gfp)
  27 + dma_addr_t * dma_handle, gfp_t gfp)
28 28 {
29 29 void *ret;
30 30 /* ignore region specifiers */
... ... @@ -45,7 +45,7 @@
45 45 EXPORT_SYMBOL(dma_alloc_noncoherent);
46 46  
47 47 void *dma_alloc_coherent(struct device *dev, size_t size,
48   - dma_addr_t * dma_handle, int gfp)
  48 + dma_addr_t * dma_handle, gfp_t gfp)
49 49 {
50 50 void *ret;
51 51  
include/asm-mips/dma-mapping.h
Diff comments   View file @ 185a8ff
... ... @@ -5,13 +5,13 @@
5 5 #include <asm/cache.h>
6 6  
7 7 void *dma_alloc_noncoherent(struct device *dev, size_t size,
8   - dma_addr_t *dma_handle, int flag);
  8 + dma_addr_t *dma_handle, gfp_t flag);
9 9  
10 10 void dma_free_noncoherent(struct device *dev, size_t size,
11 11 void *vaddr, dma_addr_t dma_handle);
12 12  
13 13 void *dma_alloc_coherent(struct device *dev, size_t size,
14   - dma_addr_t *dma_handle, int flag);
  14 + dma_addr_t *dma_handle, gfp_t flag);
15 15  
16 16 void dma_free_coherent(struct device *dev, size_t size,
17 17 void *vaddr, dma_addr_t dma_handle);