diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 08:17:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 08:17:24 -0500 |
| commit | 46483d10e5123d78cf9abf37577aa8e75f18b8a4 (patch) | |
| tree | ffb646db8023433588ce87797a9428c90ec118bc /arch/x86/include | |
| parent | c59ab97e9ecdee9084d2da09e5a8ceea9a396508 (diff) | |
| parent | 874d6a9555516cbac828131d573ce3d16ce47164 (diff) | |
Merge branch 'core/iommu' into core/urgent
Conflicts:
lib/swiotlb.c
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/swiotlb.h | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/arch/x86/include/asm/swiotlb.h b/arch/x86/include/asm/swiotlb.h index 51fb2c76ad74..b9e4e20174fb 100644 --- a/arch/x86/include/asm/swiotlb.h +++ b/arch/x86/include/asm/swiotlb.h | |||
| @@ -1,46 +1,10 @@ | |||
| 1 | #ifndef _ASM_X86_SWIOTLB_H | 1 | #ifndef _ASM_X86_SWIOTLB_H |
| 2 | #define _ASM_X86_SWIOTLB_H | 2 | #define _ASM_X86_SWIOTLB_H |
| 3 | 3 | ||
| 4 | #include <asm/dma-mapping.h> | 4 | #include <linux/swiotlb.h> |
| 5 | 5 | ||
| 6 | /* SWIOTLB interface */ | 6 | /* SWIOTLB interface */ |
| 7 | 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 | |||
| 44 | extern int swiotlb_force; | 8 | extern int swiotlb_force; |
| 45 | 9 | ||
| 46 | #ifdef CONFIG_SWIOTLB | 10 | #ifdef CONFIG_SWIOTLB |