lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] gfp_t: dma-mapping (arm)

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro
2005-10-21 03:20:58 -04:00
committed by Linus Torvalds
parent 8267e268e0
commit f9e3214a79
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mm/consistent.c
View File

@@ -75,7 +75,7 @@ static struct vm_region consistent_head = {
}; };
static struct vm_region * 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 addr = head->vm_start, end = head->vm_end - size;
unsigned long flags; unsigned long flags;
@@ -133,7 +133,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad
#endif #endif
static void * 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) pgprot_t prot)
{ {
struct page *page; 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. * virtual and bus address for that space.
*/ */
void * 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, return __dma_alloc(dev, size, handle, gfp,
pgprot_noncached(pgprot_kernel)); pgprot_noncached(pgprot_kernel));
@@ -263,7 +263,7 @@ EXPORT_SYMBOL(dma_alloc_coherent);
* dma_alloc_coherent above. * dma_alloc_coherent above.
*/ */
void * 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, return __dma_alloc(dev, size, handle, gfp,
pgprot_writecombine(pgprot_kernel)); pgprot_writecombine(pgprot_kernel));

4
include/asm-arm/dma-mapping.h
View File

@@ -70,7 +70,7 @@ static inline int dma_mapping_error(dma_addr_t dma_addr)
* device-viewed address. * device-viewed address.
*/ */
extern void * 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 * 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. * device-viewed address.
*/ */
extern void * 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) \ #define dma_free_writecombine(dev,size,cpu_addr,handle) \
dma_free_coherent(dev,size,cpu_addr,handle) dma_free_coherent(dev,size,cpu_addr,handle)