openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Yinghai Lu 2007-07-21 17:11:23 +02:00 committed by Linus Torvalds
parent e199ece447
commit 1048fa5281
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86_64/kernel/pci-gart.c
View File

@ -235,7 +235,7 @@ static dma_addr_t gart_map_simple(struct device *dev, char *buf,
} }
/* Map a single area into the IOMMU */ /* 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; 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. * 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) size_t size, int direction)
{ {
unsigned long iommu_page; 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. * 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; int i;

6
arch/x86_64/kernel/pci-nommu.c
View File

@ -34,7 +34,7 @@ nommu_map_single(struct device *hwdev, void *ptr, size_t size,
return bus; 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) 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 * Device ownership issues as mentioned above for pci_map_single are
* the same here. * 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 nents, int direction)
{ {
int i; 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 * Again, cpu read rules concerning calls here are the same as for
* pci_unmap_single() above. * 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) int nents, int dir)
{ {
} }