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-ia64
/
dma-mapping.h
diff --git
a/include/asm-ia64/dma-mapping.h
b/include/asm-ia64/dma-mapping.h
index
a527db7
..
8499cd6
100644
(file)
--- a/
include/asm-ia64/dma-mapping.h
+++ b/
include/asm-ia64/dma-mapping.h
@@
-6,7
+6,6
@@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#include <asm/machvec.h>
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#include <asm/machvec.h>
-
#ifndef CONFIG_XEN
#define dma_alloc_coherent platform_dma_alloc_coherent
#ifndef CONFIG_XEN
#define dma_alloc_coherent platform_dma_alloc_coherent
@@
-23,7
+22,6
@@
#define dma_sync_sg_for_device platform_dma_sync_sg_for_device
#define dma_mapping_error platform_dma_mapping_error
#define dma_sync_sg_for_device platform_dma_sync_sg_for_device
#define dma_mapping_error platform_dma_mapping_error
-
#else /* CONFIG_XEN */
/* Needed for arch/i386/kernel/swiotlb.c and arch/i386/kernel/pci-dma-xen.c */
#include <asm/hypervisor.h>
#else /* CONFIG_XEN */
/* Needed for arch/i386/kernel/swiotlb.c and arch/i386/kernel/pci-dma-xen.c */
#include <asm/hypervisor.h>
@@
-101,7
+99,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
@@
-110,7
+109,7
@@
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... */
#ifdef CONFIG_XEN
/* arch/i386/kernel/swiotlb.o requires */
#ifdef CONFIG_XEN
/* arch/i386/kernel/swiotlb.o requires */