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

[PATCH] gfp_t: dma-mapping (ppc) 



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

arch/ppc/kernel/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,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;
@@ -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.

 */

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 vm_region *c;

include/asm-ppc/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 * allocate the space "normally" and use the cache management functions

 * 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_sync(void *vaddr, size_t size, int direction);

extern void __dma_sync_page(struct page *page, unsigned long offset,