Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77493bd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7dedcca0 023600f1

lib/swiotlb.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -537,7 +537,8 @@ EXPORT_SYMBOL_GPL(swiotlb_tbl_map_single); 
 * Allocates bounce buffer and returns its kernel virtual address.

 * Allocates bounce buffer and returns its kernel virtual address.

 */

 */





phys_addr_t map_single(struct device *hwdev, phys_addr_t phys, size_t size,

static phys_addr_t

map_single(struct device *hwdev, phys_addr_t phys, size_t size,

	   enum dma_data_direction dir)

	   enum dma_data_direction dir)

{

{

	dma_addr_t start_dma_addr = phys_to_dma(hwdev, io_tlb_start);

	dma_addr_t start_dma_addr = phys_to_dma(hwdev, io_tlb_start);