Commit 6dae2c23 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] gfp_t: dma-mapping (sh)

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e82dd4d6
...@@ -23,7 +23,7 @@ extern void init_rts7751r2d_IRQ(void); ...@@ -23,7 +23,7 @@ extern void init_rts7751r2d_IRQ(void);
extern void *rts7751r2d_ioremap(unsigned long, unsigned long); extern void *rts7751r2d_ioremap(unsigned long, unsigned long);
extern int rts7751r2d_irq_demux(int irq); extern int rts7751r2d_irq_demux(int irq);
extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, int); extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t); extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
/* /*
......
...@@ -31,7 +31,7 @@ static LIST_HEAD(voya_alloc_list); ...@@ -31,7 +31,7 @@ static LIST_HEAD(voya_alloc_list);
#define OHCI_SRAM_SIZE 0x10000 #define OHCI_SRAM_SIZE 0x10000
void *voyagergx_consistent_alloc(struct device *dev, size_t size, void *voyagergx_consistent_alloc(struct device *dev, size_t size,
dma_addr_t *handle, int flag) dma_addr_t *handle, gfp_t flag)
{ {
struct list_head *list = &voya_alloc_list; struct list_head *list = &voya_alloc_list;
struct voya_alloc_entry *entry; struct voya_alloc_entry *entry;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
static int gapspci_dma_used = 0; static int gapspci_dma_used = 0;
void *dreamcast_consistent_alloc(struct device *dev, size_t size, void *dreamcast_consistent_alloc(struct device *dev, size_t size,
dma_addr_t *dma_handle, int flag) dma_addr_t *dma_handle, gfp_t flag)
{ {
unsigned long buf; unsigned long buf;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <asm/io.h> #include <asm/io.h>
void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle) void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
{ {
struct page *page, *end, *free; struct page *page, *end, *free;
void *ret; void *ret;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
extern struct bus_type pci_bus_type; extern struct bus_type pci_bus_type;
/* arch/sh/mm/consistent.c */ /* arch/sh/mm/consistent.c */
extern void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle); extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle);
extern void consistent_free(void *vaddr, size_t size); extern void consistent_free(void *vaddr, size_t size);
extern void consistent_sync(void *vaddr, size_t size, int direction); extern void consistent_sync(void *vaddr, size_t size, int direction);
...@@ -26,7 +26,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask) ...@@ -26,7 +26,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
} }
static inline void *dma_alloc_coherent(struct device *dev, size_t size, static inline void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, int flag) dma_addr_t *dma_handle, gfp_t flag)
{ {
if (sh_mv.mv_consistent_alloc) { if (sh_mv.mv_consistent_alloc) {
void *ret; void *ret;
......
...@@ -64,7 +64,7 @@ struct sh_machine_vector ...@@ -64,7 +64,7 @@ struct sh_machine_vector
void (*mv_heartbeat)(void); void (*mv_heartbeat)(void);
void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, int); void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, gfp_t);
int (*mv_consistent_free)(struct device *, size_t, void *, dma_addr_t); int (*mv_consistent_free)(struct device *, size_t, void *, dma_addr_t);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment