diff options
| author | Ingo Molnar | 2009-01-05 14:17:24 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-01-05 14:17:24 +0100 |
| commit | 46483d10e5123d78cf9abf37577aa8e75f18b8a4 (patch) | |
| tree | ffb646db8023433588ce87797a9428c90ec118bc /include | |
| parent | rcu: fix rcutorture bug (diff) | |
| parent | swiotlb: clean up EXPORT_SYMBOL usage (diff) | |
| download | kernel-qcow2-linux-46483d10e5123d78cf9abf37577aa8e75f18b8a4.tar.gz kernel-qcow2-linux-46483d10e5123d78cf9abf37577aa8e75f18b8a4.tar.xz kernel-qcow2-linux-46483d10e5123d78cf9abf37577aa8e75f18b8a4.zip | |
Merge branch 'core/iommu' into core/urgent
Conflicts:
lib/swiotlb.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/swiotlb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 325af1de0351..dedd3c0cfe30 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -27,7 +27,8 @@ 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(phys_addr_t address); +extern dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, + phys_addr_t address); extern phys_addr_t swiotlb_bus_to_phys(dma_addr_t address); extern int swiotlb_arch_range_needs_mapping(void *ptr, size_t size); |