diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/renesas/rts7751r2d/mach.c | 2 | ||||
-rw-r--r-- | arch/sh/cchips/voyagergx/consistent.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/dma-dreamcast.c | 2 | ||||
-rw-r--r-- | arch/sh/mm/consistent.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/boards/renesas/rts7751r2d/mach.c b/arch/sh/boards/renesas/rts7751r2d/mach.c index 1efc18e786d5..610740512d56 100644 --- a/arch/sh/boards/renesas/rts7751r2d/mach.c +++ b/arch/sh/boards/renesas/rts7751r2d/mach.c | |||
@@ -23,7 +23,7 @@ extern void init_rts7751r2d_IRQ(void); | |||
23 | extern void *rts7751r2d_ioremap(unsigned long, unsigned long); | 23 | extern void *rts7751r2d_ioremap(unsigned long, unsigned long); |
24 | extern int rts7751r2d_irq_demux(int irq); | 24 | extern int rts7751r2d_irq_demux(int irq); |
25 | 25 | ||
26 | extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, int); | 26 | extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t); |
27 | extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t); | 27 | extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t); |
28 | 28 | ||
29 | /* | 29 | /* |
diff --git a/arch/sh/cchips/voyagergx/consistent.c b/arch/sh/cchips/voyagergx/consistent.c index 5b92585a38d2..3d9a02c093a3 100644 --- a/arch/sh/cchips/voyagergx/consistent.c +++ b/arch/sh/cchips/voyagergx/consistent.c | |||
@@ -31,7 +31,7 @@ static LIST_HEAD(voya_alloc_list); | |||
31 | #define OHCI_SRAM_SIZE 0x10000 | 31 | #define OHCI_SRAM_SIZE 0x10000 |
32 | 32 | ||
33 | void *voyagergx_consistent_alloc(struct device *dev, size_t size, | 33 | void *voyagergx_consistent_alloc(struct device *dev, size_t size, |
34 | dma_addr_t *handle, int flag) | 34 | dma_addr_t *handle, gfp_t flag) |
35 | { | 35 | { |
36 | struct list_head *list = &voya_alloc_list; | 36 | struct list_head *list = &voya_alloc_list; |
37 | struct voya_alloc_entry *entry; | 37 | struct voya_alloc_entry *entry; |
diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c index 83de7ef4e7df..e12418bb1fa5 100644 --- a/arch/sh/drivers/pci/dma-dreamcast.c +++ b/arch/sh/drivers/pci/dma-dreamcast.c | |||
@@ -33,7 +33,7 @@ | |||
33 | static int gapspci_dma_used = 0; | 33 | static int gapspci_dma_used = 0; |
34 | 34 | ||
35 | void *dreamcast_consistent_alloc(struct device *dev, size_t size, | 35 | void *dreamcast_consistent_alloc(struct device *dev, size_t size, |
36 | dma_addr_t *dma_handle, int flag) | 36 | dma_addr_t *dma_handle, gfp_t flag) |
37 | { | 37 | { |
38 | unsigned long buf; | 38 | unsigned long buf; |
39 | 39 | ||
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index 1f7af0c73cf4..df3a9e452cc5 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/dma-mapping.h> | 11 | #include <linux/dma-mapping.h> |
12 | #include <asm/io.h> | 12 | #include <asm/io.h> |
13 | 13 | ||
14 | void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle) | 14 | void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle) |
15 | { | 15 | { |
16 | struct page *page, *end, *free; | 16 | struct page *page, *end, *free; |
17 | void *ret; | 17 | void *ret; |