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

Commit 185a8ff5 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: dma-mapping (mips) 



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

arch/mips/mm/dma-coherent.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <asm/io.h>



void *dma_alloc_noncoherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, int gfp)

	dma_addr_t * dma_handle, gfp_t gfp)

{

	void *ret;

	/* ignore region specifiers */
@@ -39,7 +39,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, 
EXPORT_SYMBOL(dma_alloc_noncoherent);



void *dma_alloc_coherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, int gfp)

	dma_addr_t * dma_handle, gfp_t gfp)

	__attribute__((alias("dma_alloc_noncoherent")));



EXPORT_SYMBOL(dma_alloc_coherent);

arch/mips/mm/dma-ip27.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
	pdev_to_baddr(to_pci_dev(dev), (addr))



void *dma_alloc_noncoherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, int gfp)

	dma_addr_t * dma_handle, gfp_t gfp)

{

	void *ret;
@@ -44,7 +44,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, 
EXPORT_SYMBOL(dma_alloc_noncoherent);



void *dma_alloc_coherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, int gfp)

	dma_addr_t * dma_handle, gfp_t gfp)

	__attribute__((alias("dma_alloc_noncoherent")));



EXPORT_SYMBOL(dma_alloc_coherent);

arch/mips/mm/dma-ip32.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#define RAM_OFFSET_MASK	0x3fffffff



void *dma_alloc_noncoherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, int gfp)

	dma_addr_t * dma_handle, gfp_t gfp)

{

	void *ret;

	/* ignore region specifiers */
@@ -61,7 +61,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, 
EXPORT_SYMBOL(dma_alloc_noncoherent);



void *dma_alloc_coherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, int gfp)

	dma_addr_t * dma_handle, gfp_t gfp)

{

	void *ret;

arch/mips/mm/dma-noncoherent.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 */



void *dma_alloc_noncoherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, int gfp)

	dma_addr_t * dma_handle, gfp_t gfp)

{

	void *ret;

	/* ignore region specifiers */
@@ -45,7 +45,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size, 
EXPORT_SYMBOL(dma_alloc_noncoherent);



void *dma_alloc_coherent(struct device *dev, size_t size,

	dma_addr_t * dma_handle, int gfp)

	dma_addr_t * dma_handle, gfp_t gfp)

{

	void *ret;

include/asm-mips/dma-mapping.h

+2 −2
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
#include <asm/cache.h>



void *dma_alloc_noncoherent(struct device *dev, size_t size,

			   dma_addr_t *dma_handle, int flag);

			   dma_addr_t *dma_handle, gfp_t flag);



void dma_free_noncoherent(struct device *dev, size_t size,

			 void *vaddr, dma_addr_t dma_handle);



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);



void dma_free_coherent(struct device *dev, size_t size,

			 void *vaddr, dma_addr_t dma_handle);