[PATCH] m68k: dma_alloc_coherent() has gfp_t as the last argument
authorAl Viro <viro@ftp.linux.org.uk>
Fri, 6 Oct 2006 07:43:58 +0000 (00:43 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Oct 2006 15:53:41 +0000 (08:53 -0700)
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>
arch/m68k/kernel/dma.c
include/asm-m68k/dma-mapping.h

index fc449f8b204504ac9193a4472c07ca32a6fb7af6..9d4e4b5b6bd889325d274334fd6b608989440831 100644 (file)
@@ -15,7 +15,7 @@
 #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 *dev, size_t size,
                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;
index cebbb03370eca37fdb33d3ab8a71611be0280489..c1299c3beb507e9c17f2da8f2b2813fe20ea2224 100644 (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,
-                               dma_addr_t *, int);
+                               dma_addr_t *, gfp_t);
 extern void dma_free_coherent(struct device *, size_t,
                              void *, dma_addr_t);