Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970a9e73 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: dma-mapping (simple cases) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5fb5cbed

include/asm-generic/dma-mapping-broken.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/asm-m32r/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

include/asm-sh64/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

include/asm-sparc/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/asm-sparc64/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -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;