Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc366708 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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



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

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5e7c4ea8

arch/m68k/kernel/dma.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/asm-m68k/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -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);