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

Commit 1048fa52 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

x86_64: change _map_single to static in pci_gart.c etc 



This function is called via dma_ops->.., so change it to static

Signed-off-by: default avatarYinghai Lu <yinghai.lu@sun.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e199ece4

arch/x86_64/kernel/pci-gart.c

+3 −3
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static dma_addr_t gart_map_simple(struct device *dev, char *buf, 
}



/* Map a single area into the IOMMU */

dma_addr_t gart_map_single(struct device *dev, void *addr, size_t size, int dir)

static dma_addr_t gart_map_single(struct device *dev, void *addr, size_t size, int dir)

{

	unsigned long phys_mem, bus;
@@ -253,7 +253,7 @@ dma_addr_t gart_map_single(struct device *dev, void *addr, size_t size, int dir) 
/*

 * Free a DMA mapping.

 */

void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,

static void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,

		      size_t size, int direction)

{

	unsigned long iommu_page;
@@ -275,7 +275,7 @@ void gart_unmap_single(struct device *dev, dma_addr_t dma_addr, 
/*

 * Wrapper for pci_unmap_single working with scatterlists.

 */

void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)

static void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)

{

	int i;

arch/x86_64/kernel/pci-nommu.c

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ nommu_map_single(struct device *hwdev, void *ptr, size_t size, 
	return bus;

}



void nommu_unmap_single(struct device *dev, dma_addr_t addr,size_t size,

static void nommu_unmap_single(struct device *dev, dma_addr_t addr,size_t size,

			int direction)

{

}
@@ -54,7 +54,7 @@ void nommu_unmap_single(struct device *dev, dma_addr_t addr,size_t size, 
 * Device ownership issues as mentioned above for pci_map_single are

 * the same here.

 */

int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,

static int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,

	       int nents, int direction)

{

	int i;
@@ -74,7 +74,7 @@ int nommu_map_sg(struct device *hwdev, struct scatterlist *sg, 
 * Again, cpu read rules concerning calls here are the same as for

 * pci_unmap_single() above.

 */

void nommu_unmap_sg(struct device *dev, struct scatterlist *sg,

static void nommu_unmap_sg(struct device *dev, struct scatterlist *sg,

		  int nents, int dir)

{

}