Skip to content

Commit

Permalink
[PATCH] gfp_t: dma-mapping (simple cases)
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 28, 2005
1 parent 5fb5cbe commit 970a9e7
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/asm-generic/dma-mapping-broken.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
int flag)
gfp_t flag)
{
BUG();
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion include/asm-m32r/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
int flag)
gfp_t flag)
{
return (void *)NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion include/asm-sh64/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
}

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)
{
return consistent_alloc(NULL, size, dma_handle);
}
Expand Down
2 changes: 1 addition & 1 deletion include/asm-sparc/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#else

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)
{
BUG();
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion include/asm-sparc64/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
struct device;

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)
{
BUG();
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion include/asm-um/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dma_set_mask(struct device *dev, u64 dma_mask)

static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
int flag)
gfp_t flag)
{
BUG();
return((void *) 0);
Expand Down

0 comments on commit 970a9e7

Please sign in to comment.