diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-11 14:15:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-11 14:15:06 -0800 |
| commit | 3d5e28bff7ad55aea081c1af516cc1c94a5eca7d (patch) | |
| tree | 4c2e8b419328077f1d7319e691252ed2605ed655 /include | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single (diff) | |
| download | linux-dev-3d5e28bff7ad55aea081c1af516cc1c94a5eca7d.tar.xz linux-dev-3d5e28bff7ad55aea081c1af516cc1c94a5eca7d.zip | |
Merge branch 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb fixes from Konrad Rzeszutek Wilk:
"Two tiny fixes for issues that make drivers under Xen unhappy under
certain conditions"
* 'stable/for-linus-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single
swiotlb: fix "x86: Don't panic if can not alloc buffer for swiotlb"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/swiotlb.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 513913ff7486..3bb72266a75a 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -45,13 +45,9 @@ enum dma_sync_target { SYNC_FOR_DEVICE = 1, }; -extern phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, - dma_addr_t tbl_dma_addr, - phys_addr_t phys, - size_t mapping_size, - size_t alloc_size, - enum dma_data_direction dir, - unsigned long attrs); +phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t phys, + size_t mapping_size, size_t alloc_size, + enum dma_data_direction dir, unsigned long attrs); extern void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr, |