diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-06 09:06:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-06 09:06:20 -0700 |
| commit | 77493bd9b2c9b1e07c2d9ccc481ed4dfc7ef2d1c (patch) | |
| tree | 6a85413a1face6ef58b1b9eef639ce68858c7490 | |
| parent | 7dedcca09e9a751fd14fdb8e9882d675b23b2c0e (diff) | |
| parent | 023600f192be3f5776336e2c61d577b551a1ca9c (diff) | |
| download | linux-stable-77493bd9b2c9b1e07c2d9ccc481ed4dfc7ef2d1c.tar.gz linux-stable-77493bd9b2c9b1e07c2d9ccc481ed4dfc7ef2d1c.tar.bz2 linux-stable-77493bd9b2c9b1e07c2d9ccc481ed4dfc7ef2d1c.zip | |
Merge branch 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb fix from Konrad Rzeszutek Wilk:
"Tiny little fix which just converts an function to be static. Really
tiny"
* 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
swiotlb: do not export map_single function
| -rw-r--r-- | lib/swiotlb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 4abda074ea45..3c365ab6cf5f 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -537,8 +537,9 @@ EXPORT_SYMBOL_GPL(swiotlb_tbl_map_single); * Allocates bounce buffer and returns its kernel virtual address. */ -phys_addr_t map_single(struct device *hwdev, phys_addr_t phys, size_t size, - enum dma_data_direction dir) +static phys_addr_t +map_single(struct device *hwdev, phys_addr_t phys, size_t size, + enum dma_data_direction dir) { dma_addr_t start_dma_addr = phys_to_dma(hwdev, io_tlb_start); |