diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 20:10:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 20:10:04 -0500 |
| commit | f94181da7192f4ed8ccb1b633ea4ce56954df130 (patch) | |
| tree | 2e28785f2df447573a11fbdd611dc19eb3fcb794 /arch/ia64 | |
| parent | 932adbed6d99cc373fc3433d701b3a594fea872c (diff) | |
| parent | fdbc0450df12cc9cb397f3497db4b0cad7c1a8ff (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rcu: fix rcutorture bug
rcu: eliminate synchronize_rcu_xxx macro
rcu: make treercu safe for suspend and resume
rcu: fix rcutree grace-period-latency bug on small systems
futex: catch certain assymetric (get|put)_futex_key calls
futex: make futex_(get|put)_key() calls symmetric
locking, percpu counters: introduce separate lock classes
swiotlb: clean up EXPORT_SYMBOL usage
swiotlb: remove unnecessary declaration
swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h
swiotlb: add support for systems with highmem
swiotlb: store phys address in io_tlb_orig_addr array
swiotlb: add hwdev to swiotlb_phys_to_bus() / swiotlb_sg_to_bus()
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/swiotlb.h | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/arch/ia64/include/asm/swiotlb.h b/arch/ia64/include/asm/swiotlb.h index fb79423834d0..dcbaea7ce128 100644 --- a/arch/ia64/include/asm/swiotlb.h +++ b/arch/ia64/include/asm/swiotlb.h | |||
| @@ -2,44 +2,7 @@ | |||
| 2 | #define ASM_IA64__SWIOTLB_H | 2 | #define ASM_IA64__SWIOTLB_H |
| 3 | 3 | ||
| 4 | #include <linux/dma-mapping.h> | 4 | #include <linux/dma-mapping.h> |
| 5 | 5 | #include <linux/swiotlb.h> | |
| 6 | /* SWIOTLB interface */ | ||
| 7 | |||
| 8 | extern dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr, | ||
| 9 | size_t size, int dir); | ||
| 10 | extern void *swiotlb_alloc_coherent(struct device *hwdev, size_t size, | ||
| 11 | dma_addr_t *dma_handle, gfp_t flags); | ||
| 12 | extern void swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr, | ||
| 13 | size_t size, int dir); | ||
| 14 | extern void swiotlb_sync_single_for_cpu(struct device *hwdev, | ||
| 15 | dma_addr_t dev_addr, | ||
| 16 | size_t size, int dir); | ||
| 17 | extern void swiotlb_sync_single_for_device(struct device *hwdev, | ||
| 18 | dma_addr_t dev_addr, | ||
| 19 | size_t size, int dir); | ||
| 20 | extern void swiotlb_sync_single_range_for_cpu(struct device *hwdev, | ||
| 21 | dma_addr_t dev_addr, | ||
| 22 | unsigned long offset, | ||
| 23 | size_t size, int dir); | ||
| 24 | extern void swiotlb_sync_single_range_for_device(struct device *hwdev, | ||
| 25 | dma_addr_t dev_addr, | ||
| 26 | unsigned long offset, | ||
| 27 | size_t size, int dir); | ||
| 28 | extern void swiotlb_sync_sg_for_cpu(struct device *hwdev, | ||
| 29 | struct scatterlist *sg, int nelems, | ||
| 30 | int dir); | ||
| 31 | extern void swiotlb_sync_sg_for_device(struct device *hwdev, | ||
| 32 | struct scatterlist *sg, int nelems, | ||
| 33 | int dir); | ||
| 34 | extern int swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, | ||
| 35 | int nents, int direction); | ||
| 36 | extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, | ||
| 37 | int nents, int direction); | ||
| 38 | extern int swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr); | ||
| 39 | extern void swiotlb_free_coherent(struct device *hwdev, size_t size, | ||
| 40 | void *vaddr, dma_addr_t dma_handle); | ||
| 41 | extern int swiotlb_dma_supported(struct device *hwdev, u64 mask); | ||
| 42 | extern void swiotlb_init(void); | ||
| 43 | 6 | ||
| 44 | extern int swiotlb_force; | 7 | extern int swiotlb_force; |
| 45 | 8 | ||