diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:21:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 11:16:48 -0400 |
commit | e82dd4d6472304495afa271b2f63b572868b23d9 (patch) | |
tree | 9b3dec842d9e8ff932392c723fd61580a3bcfc39 /arch/ppc | |
parent | 5c1fb41f40b7b6d819a617f52dbd66b6938ef362 (diff) |
[PATCH] gfp_t: dma-mapping (ppc)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/kernel/dma-mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c index 8edee806dae7..0f710d2baec6 100644 --- a/arch/ppc/kernel/dma-mapping.c +++ b/arch/ppc/kernel/dma-mapping.c | |||
@@ -115,7 +115,7 @@ static struct vm_region consistent_head = { | |||
115 | }; | 115 | }; |
116 | 116 | ||
117 | static struct vm_region * | 117 | static struct vm_region * |
118 | vm_region_alloc(struct vm_region *head, size_t size, int gfp) | 118 | vm_region_alloc(struct vm_region *head, size_t size, gfp_t gfp) |
119 | { | 119 | { |
120 | unsigned long addr = head->vm_start, end = head->vm_end - size; | 120 | unsigned long addr = head->vm_start, end = head->vm_end - size; |
121 | unsigned long flags; | 121 | unsigned long flags; |
@@ -173,7 +173,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad | |||
173 | * virtual and bus address for that space. | 173 | * virtual and bus address for that space. |
174 | */ | 174 | */ |
175 | void * | 175 | void * |
176 | __dma_alloc_coherent(size_t size, dma_addr_t *handle, int gfp) | 176 | __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp) |
177 | { | 177 | { |
178 | struct page *page; | 178 | struct page *page; |
179 | struct vm_region *c; | 179 | struct vm_region *c; |