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
/
mips
/
mm
/
dma-ip27.c
diff --git
a/arch/mips/mm/dma-ip27.c
b/arch/mips/mm/dma-ip27.c
index
aa7c94b
..
f088344
100644
(file)
--- a/
arch/mips/mm/dma-ip27.c
+++ b/
arch/mips/mm/dma-ip27.c
@@
-22,7
+22,7
@@
pdev_to_baddr(to_pci_dev(dev), (addr))
void *dma_alloc_noncoherent(struct device *dev, size_t size,
pdev_to_baddr(to_pci_dev(dev), (addr))
void *dma_alloc_noncoherent(struct device *dev, size_t size,
- dma_addr_t * dma_handle,
in
t gfp)
+ dma_addr_t * dma_handle,
gfp_
t gfp)
{
void *ret;
{
void *ret;
@@
-44,7
+44,7
@@
void *dma_alloc_noncoherent(struct device *dev, size_t size,
EXPORT_SYMBOL(dma_alloc_noncoherent);
void *dma_alloc_coherent(struct device *dev, size_t size,
EXPORT_SYMBOL(dma_alloc_noncoherent);
void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t * dma_handle,
in
t gfp)
+ dma_addr_t * dma_handle,
gfp_
t gfp)
__attribute__((alias("dma_alloc_noncoherent")));
EXPORT_SYMBOL(dma_alloc_coherent);
__attribute__((alias("dma_alloc_noncoherent")));
EXPORT_SYMBOL(dma_alloc_coherent);
@@
-197,14
+197,14
@@
int dma_supported(struct device *dev, u64 mask)
EXPORT_SYMBOL(dma_supported);
EXPORT_SYMBOL(dma_supported);
-int dma_is_consistent(dma_addr_t dma_addr)
+int dma_is_consistent(
struct device *dev,
dma_addr_t dma_addr)
{
return 1;
}
EXPORT_SYMBOL(dma_is_consistent);
{
return 1;
}
EXPORT_SYMBOL(dma_is_consistent);
-void dma_cache_sync(void *vaddr, size_t size,
+void dma_cache_sync(
struct device *dev,
void *vaddr, size_t size,
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);
enum dma_data_direction direction)
{
BUG_ON(direction == DMA_NONE);