m68k dma_alloc_coherent() has gfp_t as the last argument
PATCH 1/1 m68k dma_alloc_coherent() has gfp_t as the last argument
annotate, fix the bogus argument of vmap() in it.
Signed-off-by Al Viro <[email protected]>
--- arch/m68k/kernel/dma.c | 4 ++-- include/asm-m68k/dma-mapping.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/m68k/kernel/dma.c +2 -2
@@ -15,7 +15,7 @@ #include <asm/pgalloc.h>#include <asm/scatterlist.h> 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;pgprot_t pgprot;
@@ -51,7 +51,7 @@ void *dma_alloc_coherent(struct device *pgprot_val (pgprot) |= _PAGE_GLOBAL040 | _PAGE_NOCACHE_S; else pgprot_val(pgprot) |= _PAGE_NOCACHE030; - addr = vmap(map, size, flag, pgprot); + addr = vmap(map, size, VM_MAP, pgprot); kfree(map); return addr;
include/asm-m68k/dma-mapping.h +1 -1
@@ -26,7 +26,7 @@ static inline int dma_is_consistent(dma_ }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 ,void *,dma_addr_t );
Signature · 1 line
1.4.2.GIT