The patch titled
m68k: dma_alloc_coherent() has gfp_t as the last argument
has been added to the -mm tree. Its filename is
m68k-dma_alloc_coherent-has-gfp_t-as-the-last-argument.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: m68k: dma_alloc_coherent() has gfp_t as the last argument
From: Al Viro <viro@xxxxxxxxxxxxxxxx>
annotate, fix the bogus argument of vmap() in it.
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/m68k/kernel/dma.c | 4 ++--
include/asm-m68k/dma-mapping.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/m68k/kernel/dma.c~m68k-dma_alloc_coherent-has-gfp_t-as-the-last-argument arch/m68k/kernel/dma.c
--- a/arch/m68k/kernel/dma.c~m68k-dma_alloc_coherent-has-gfp_t-as-the-last-argument
+++ a/arch/m68k/kernel/dma.c
@@ -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 *
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;
diff -puN include/asm-m68k/dma-mapping.h~m68k-dma_alloc_coherent-has-gfp_t-as-the-last-argument include/asm-m68k/dma-mapping.h
--- a/include/asm-m68k/dma-mapping.h~m68k-dma_alloc_coherent-has-gfp_t-as-the-last-argument
+++ a/include/asm-m68k/dma-mapping.h
@@ -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);
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are
m68k-dma_alloc_coherent-has-gfp_t-as-the-last-argument.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
