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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
pci-dma.c
diff --git
a/arch/i386/kernel/pci-dma.c
b/arch/i386/kernel/pci-dma.c
index
4de2e03
..
25fe668
100644
(file)
--- a/
arch/i386/kernel/pci-dma.c
+++ b/
arch/i386/kernel/pci-dma.c
@@
-11,6
+11,7
@@
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/pci.h>
+#include <linux/module.h>
#include <asm/io.h>
struct dma_coherent_mem {
#include <asm/io.h>
struct dma_coherent_mem {
@@
-22,7
+23,7
@@
struct dma_coherent_mem {
};
void *dma_alloc_coherent(struct device *dev, size_t size,
};
void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle,
unsigned int __nocas
t gfp)
+ dma_addr_t *dma_handle,
gfp_
t gfp)
{
void *ret;
struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
{
void *ret;
struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL;
@@
-54,6
+55,7
@@
void *dma_alloc_coherent(struct device *dev, size_t size,
}
return ret;
}
}
return ret;
}
+EXPORT_SYMBOL(dma_alloc_coherent);
void dma_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle)
void dma_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle)
@@
-68,6
+70,7
@@
void dma_free_coherent(struct device *dev, size_t size,
} else
free_pages((unsigned long)vaddr, order);
}
} else
free_pages((unsigned long)vaddr, order);
}
+EXPORT_SYMBOL(dma_free_coherent);
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags)
int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags)