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

[PATCH] m68k: dma_alloc_coherent() has gfp_t as the last argument

Browse Source 
annotate, fix the bogus argument of vmap() in it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro
2006-10-06 00:43:58 -07:00
committed by Linus Torvalds
parent 5e7c4ea83e
commit dc366708b3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/m68k/kernel/dma.c
View File

@@ -15,7 +15,7 @@
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
void *dma_alloc_coherent(struct device *dev, size_t size, void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *handle, int flag) dma_addr_t *handle, gfp_t flag)
{ {
struct page *page, **map; struct page *page, **map;
pgprot_t pgprot; pgprot_t pgprot;
@@ -51,7 +51,7 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
pgprot_val(pgprot) |= _PAGE_GLOBAL040 | _PAGE_NOCACHE_S; pgprot_val(pgprot) |= _PAGE_GLOBAL040 | _PAGE_NOCACHE_S;
else else
pgprot_val(pgprot) |= _PAGE_NOCACHE030; pgprot_val(pgprot) |= _PAGE_NOCACHE030;
addr = vmap(map, size, flag, pgprot); addr = vmap(map, size, VM_MAP, pgprot);
kfree(map); kfree(map);
return addr; return addr;

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

@@ -26,7 +26,7 @@ static inline int dma_is_consistent(dma_addr_t dma_addr)
} }
extern void *dma_alloc_coherent(struct device *, size_t, extern void *dma_alloc_coherent(struct device *, size_t,
dma_addr_t *, int); dma_addr_t *, gfp_t);
extern void dma_free_coherent(struct device *, size_t, extern void dma_free_coherent(struct device *, size_t,
void *, dma_addr_t); void *, dma_addr_t);