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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-arm
/
dma-mapping.h
diff --git
a/include/asm-arm/dma-mapping.h
b/include/asm-arm/dma-mapping.h
index
925d016
..
e3e8541
100644
(file)
--- a/
include/asm-arm/dma-mapping.h
+++ b/
include/asm-arm/dma-mapping.h
@@
-21,6
+21,9
@@
extern void consistent_sync(void *kaddr, size_t size, int rw);
* properly. For example, if your device can only drive the low 24-bits
* during bus mastering, then you would pass 0x00ffffff as the mask
* to this function.
* properly. For example, if your device can only drive the low 24-bits
* during bus mastering, then you would pass 0x00ffffff as the mask
* to this function.
+ *
+ * FIXME: This should really be a platform specific issue - we should
+ * return false if GFP_DMA allocations may not satisfy the supplied 'mask'.
*/
static inline int dma_supported(struct device *dev, u64 mask)
{
*/
static inline int dma_supported(struct device *dev, u64 mask)
{
@@
-67,7
+70,7
@@
static inline int dma_mapping_error(dma_addr_t dma_addr)
* device-viewed address.
*/
extern void *
* device-viewed address.
*/
extern void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle,
in
t gfp);
+dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle,
gfp_
t gfp);
/**
* dma_free_coherent - free memory allocated by dma_alloc_coherent
/**
* dma_free_coherent - free memory allocated by dma_alloc_coherent
@@
-114,7
+117,7
@@
int dma_mmap_coherent(struct device *dev, struct vm_area_struct *vma,
* device-viewed address.
*/
extern void *
* device-viewed address.
*/
extern void *
-dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle,
in
t gfp);
+dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle,
gfp_
t gfp);
#define dma_free_writecombine(dev,size,cpu_addr,handle) \
dma_free_coherent(dev,size,cpu_addr,handle)
#define dma_free_writecombine(dev,size,cpu_addr,handle) \
dma_free_coherent(dev,size,cpu_addr,handle)