git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sh: intc - remove default interrupt priority tables
[sfrench/cifs-2.6.git]
/
include
/
asm-sh
/
dma-mapping.h
diff --git
a/include/asm-sh/dma-mapping.h
b/include/asm-sh/dma-mapping.h
index 84fefdaa01a53d8863fb145d0ff39e416328a597..20ae762e5258fdf4919f937907839ea1b23a77eb 100644
(file)
--- a/
include/asm-sh/dma-mapping.h
+++ b/
include/asm-sh/dma-mapping.h
@@
-2,7
+2,7
@@
#define __ASM_SH_DMA_MAPPING_H
#include <linux/mm.h>
#define __ASM_SH_DMA_MAPPING_H
#include <linux/mm.h>
-#include <
asm
/scatterlist.h>
+#include <
linux
/scatterlist.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
@@
-10,7
+10,7
@@
extern struct bus_type pci_bus_type;
/* arch/sh/mm/consistent.c */
extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle);
/* arch/sh/mm/consistent.c */
extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle);
-extern void consistent_free(void *vaddr, size_t size);
+extern void consistent_free(void *vaddr, size_t size
, dma_addr_t handle
);
extern void consistent_sync(void *vaddr, size_t size, int direction);
#define dma_supported(dev, mask) (1)
extern void consistent_sync(void *vaddr, size_t size, int direction);
#define dma_supported(dev, mask) (1)
@@
-50,7
+50,7
@@
static inline void dma_free_coherent(struct device *dev, size_t size,
return;
}
return;
}
- consistent_free(vaddr, size);
+ consistent_free(vaddr, size
, dma_handle
);
}
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
}
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
@@
-85,10
+85,9
@@
static inline int dma_map_sg(struct device *dev, struct scatterlist *sg,
for (i = 0; i < nents; i++) {
#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)
for (i = 0; i < nents; i++) {
#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)
- dma_cache_sync(dev, page_address(sg[i].page) + sg[i].offset,
- sg[i].length, dir);
+ dma_cache_sync(dev, sg_virt(&sg[i]), sg[i].length, dir);
#endif
#endif
- sg[i].dma_address =
page_to_phys(sg[i].page) + sg[i].offset
;
+ sg[i].dma_address =
sg_phys(&sg[i])
;
}
return nents;
}
return nents;
@@
-138,10
+137,9
@@
static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
for (i = 0; i < nelems; i++) {
#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)
for (i = 0; i < nelems; i++) {
#if !defined(CONFIG_PCI) || defined(CONFIG_SH_PCIDMA_NONCOHERENT)
- dma_cache_sync(dev, page_address(sg[i].page) + sg[i].offset,
- sg[i].length, dir);
+ dma_cache_sync(dev, sg_virt(&sg[i]), sg[i].length, dir);
#endif
#endif
- sg[i].dma_address =
page_to_phys(sg[i].page) + sg[i].offset
;
+ sg[i].dma_address =
sg_phys(&sg[i])
;
}
}
}
}