git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
m68k
/
kernel
/
dma.c
diff --git
a/arch/m68k/kernel/dma.c
b/arch/m68k/kernel/dma.c
index
fc449f8
..
9d4e4b5
100644
(file)
--- a/
arch/m68k/kernel/dma.c
+++ b/
arch/m68k/kernel/dma.c
@@
-15,7
+15,7
@@
#include <asm/scatterlist.h>
void *dma_alloc_coherent(struct device *dev, size_t size,
#include <asm/scatterlist.h>
void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *handle,
in
t flag)
+ dma_addr_t *handle,
gfp_
t flag)
{
struct page *page, **map;
pgprot_t pgprot;
{
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;
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;
kfree(map);
return addr;