diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-28 14:23:06 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-28 14:23:06 +1000 |
| commit | 2864697cefb6e7596e39aef933b4131f6c9fa9e1 (patch) | |
| tree | 2d5ad000593a07e28e506a0a3f581ea242a9ff4b /include/linux/swiotlb.h | |
| parent | 3c2ee2d9f41ef43a581b26b677d2b4054ccbd200 (diff) | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| download | talos-obmc-linux-2864697cefb6e7596e39aef933b4131f6c9fa9e1.tar.gz talos-obmc-linux-2864697cefb6e7596e39aef933b4131f6c9fa9e1.zip | |
Merge commit 'tip/iommu-for-powerpc' into next
Diffstat (limited to 'include/linux/swiotlb.h')
| -rw-r--r-- | include/linux/swiotlb.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index cb1a6631b8f4..73b1f1cec423 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -14,7 +14,6 @@ struct scatterlist; */ #define IO_TLB_SEGSIZE 128 - /* * log of the size of each IO TLB slab. The number of slabs is command line * controllable. @@ -24,16 +23,6 @@ struct scatterlist; extern void swiotlb_init(void); -extern void *swiotlb_alloc_boot(size_t bytes, unsigned long nslabs); -extern void *swiotlb_alloc(unsigned order, unsigned long nslabs); - -extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, - phys_addr_t address); -extern phys_addr_t swiotlb_bus_to_phys(struct device *hwdev, - dma_addr_t address); - -extern int swiotlb_arch_range_needs_mapping(phys_addr_t paddr, size_t size); - extern void *swiotlb_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t flags); |
