forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'core/iommu' into core/urgent

Browse source 
Conflicts:
	lib/swiotlb.c
This commit is contained in:
Ingo Molnar 2009-01-05 14:17:24 +01:00
commit 46483d10e5
5 changed files with 101 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/swiotlb.h
View file

@ -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);