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

[PATCH] gfp_t: dma-mapping (ppc)

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:21:33 -04:00
committed by Linus Torvalds
parent 5c1fb41f40
commit e82dd4d647
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ppc/kernel/dma-mapping.c
View File

@@ -115,7 +115,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;
@@ -173,7 +173,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad
* virtual and bus address for that space. * virtual and bus address for that space.
*/ */
void * void *
__dma_alloc_coherent(size_t size, dma_addr_t *handle, int gfp) __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
{ {
struct page *page; struct page *page;
struct vm_region *c; struct vm_region *c;

2
include/asm-ppc/dma-mapping.h
View File

@@ -19,7 +19,7 @@
* allocate the space "normally" and use the cache management functions * allocate the space "normally" and use the cache management functions
* to ensure it is consistent. * to ensure it is consistent.
*/ */
extern void *__dma_alloc_coherent(size_t size, dma_addr_t *handle, int gfp); extern void *__dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp);
extern void __dma_free_coherent(size_t size, void *vaddr); extern void __dma_free_coherent(size_t size, void *vaddr);
extern void __dma_sync(void *vaddr, size_t size, int direction); extern void __dma_sync(void *vaddr, size_t size, int direction);
extern void __dma_sync_page(struct page *page, unsigned long offset, extern void __dma_sync_page(struct page *page, unsigned long offset,