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

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

[PATCH] gfp_t: dma-mapping (arm) 



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

arch/arm/mm/consistent.c

+4 −4
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static struct vm_region consistent_head = { 
};



static struct vm_region *

vm_region_alloc(struct vm_region *head, size_t size, int gfp)

vm_region_alloc(struct vm_region *head, size_t size, gfp_t gfp)

{

	unsigned long addr = head->vm_start, end = head->vm_end - size;

	unsigned long flags;
@@ -133,7 +133,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad 
#endif



static void *

__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, int gfp,

__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,

	    pgprot_t prot)

{

	struct page *page;
@@ -251,7 +251,7 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, int gfp, 
 * virtual and bus address for that space.

 */

void *

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp)

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)

{

	return __dma_alloc(dev, size, handle, gfp,

			   pgprot_noncached(pgprot_kernel));
@@ -263,7 +263,7 @@ EXPORT_SYMBOL(dma_alloc_coherent); 
 * dma_alloc_coherent above.

 */

void *

dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, int gfp)

dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)

{

	return __dma_alloc(dev, size, handle, gfp,

			   pgprot_writecombine(pgprot_kernel));

include/asm-arm/dma-mapping.h

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static inline int dma_mapping_error(dma_addr_t dma_addr) 
 * device-viewed address.

 */

extern void *

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp);

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp);



/**

 * dma_free_coherent - free memory allocated by dma_alloc_coherent
@@ -117,7 +117,7 @@ int dma_mmap_coherent(struct device *dev, struct vm_area_struct *vma, 
 * device-viewed address.

 */

extern void *

dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, int gfp);

dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp);



#define dma_free_writecombine(dev,size,cpu_addr,handle) \

	dma_free_coherent(dev,size,cpu_addr,handle)