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]
/
include
/
asm-arm
/
dma-mapping.h
diff --git
a/include/asm-arm/dma-mapping.h
b/include/asm-arm/dma-mapping.h
index
63ca741
..
9bc46b4
100644
(file)
--- a/
include/asm-arm/dma-mapping.h
+++ b/
include/asm-arm/dma-mapping.h
@@
-3,7
+3,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/mm.h> /* need struct page */
#include <asm/scatterlist.h>
#include <linux/mm.h> /* need struct page */
#include <asm/scatterlist.h>
@@
-13,6
+12,10
@@
* uncached, unwrite-buffered mapped memory space for use with DMA
* devices. This is the "generic" version. The PCI specific version
* is in pci.h
* uncached, unwrite-buffered mapped memory space for use with DMA
* devices. This is the "generic" version. The PCI specific version
* is in pci.h
+ *
+ * Note: Drivers should NOT use this function directly, as it will break
+ * platforms with CONFIG_DMABOUNCE.
+ * Use the driver DMA support - see dma-mapping.h (dma_sync_*)
*/
extern void consistent_sync(void *kaddr, size_t size, int rw);
*/
extern void consistent_sync(void *kaddr, size_t size, int rw);
@@
-45,7
+48,7
@@
static inline int dma_get_cache_alignment(void)
return 32;
}
return 32;
}
-static inline int dma_is_consistent(dma_addr_t handle)
+static inline int dma_is_consistent(
struct device *dev,
dma_addr_t handle)
{
return !!arch_is_coherent();
}
{
return !!arch_is_coherent();
}