projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] zd1211rw: Added new USB id for Planex GW-US54ZGL
[powerpc.git]
/
include
/
asm-ia64
/
dma-mapping.h
diff --git
a/include/asm-ia64/dma-mapping.h
b/include/asm-ia64/dma-mapping.h
index
99a8f8e
..
6299b51
100644
(file)
--- a/
include/asm-ia64/dma-mapping.h
+++ b/
include/asm-ia64/dma-mapping.h
@@
-8,9
+8,20
@@
#include <asm/machvec.h>
#define dma_alloc_coherent platform_dma_alloc_coherent
#include <asm/machvec.h>
#define dma_alloc_coherent platform_dma_alloc_coherent
-#define dma_alloc_noncoherent platform_dma_alloc_coherent /* coherent mem. is cheap */
+/* coherent mem. is cheap */
+static inline void *
+dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
+ gfp_t flag)
+{
+ return dma_alloc_coherent(dev, size, dma_handle, flag);
+}
#define dma_free_coherent platform_dma_free_coherent
#define dma_free_coherent platform_dma_free_coherent
-#define dma_free_noncoherent platform_dma_free_coherent
+static inline void
+dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr,
+ dma_addr_t dma_handle)
+{
+ dma_free_coherent(dev, size, cpu_addr, dma_handle);
+}
#define dma_map_single platform_dma_map_single
#define dma_map_sg platform_dma_map_sg
#define dma_unmap_single platform_dma_unmap_single
#define dma_map_single platform_dma_map_single
#define dma_map_sg platform_dma_map_sg
#define dma_unmap_single platform_dma_unmap_single
@@
-50,7
+61,8
@@
dma_set_mask (struct device *dev, u64 mask)
extern int dma_get_cache_alignment(void);
static inline void
extern int dma_get_cache_alignment(void);
static inline void
-dma_cache_sync (void *vaddr, size_t size, enum dma_data_direction dir)
+dma_cache_sync (struct device *dev, void *vaddr, size_t size,
+ enum dma_data_direction dir)
{
/*
* IA-64 is cache-coherent, so this is mostly a no-op. However, we do need to
{
/*
* IA-64 is cache-coherent, so this is mostly a no-op. However, we do need to
@@
-59,6
+71,6
@@
dma_cache_sync (void *vaddr, size_t size, enum dma_data_direction dir)
mb();
}
mb();
}
-#define dma_is_consistent(d
ma_handle)
(1) /* all we do is coherent memory... */
+#define dma_is_consistent(d
, h)
(1) /* all we do is coherent memory... */
#endif /* _ASM_IA64_DMA_MAPPING_H */
#endif /* _ASM_IA64_DMA_MAPPING_H */