summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-05 14:17:24 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-05 14:17:24 +0100
commit46483d10e5123d78cf9abf37577aa8e75f18b8a4 (patch)
treeffb646db8023433588ce87797a9428c90ec118bc /include
parentc59ab97e9ecdee9084d2da09e5a8ceea9a396508 (diff)
parent874d6a9555516cbac828131d573ce3d16ce47164 (diff)
downloadop-kernel-dev-46483d10e5123d78cf9abf37577aa8e75f18b8a4.zip
op-kernel-dev-46483d10e5123d78cf9abf37577aa8e75f18b8a4.tar.gz
Merge branch 'core/iommu' into core/urgent
Conflicts: lib/swiotlb.c
Diffstat (limited to 'include')
-rw-r--r--include/linux/swiotlb.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 325af1d..dedd3c0 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);
OpenPOWER on IntegriCloud