hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

swiotlb: rename swiotlb_free to swiotlb_exit 

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Christoph Hellwig 2017-12-23 14:14:54 +01:00
parent 9ce9765a09
commit 7f2c8bbd32
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/dma-swiotlb.c
View File

@ -121,7 +121,7 @@ static int __init check_swiotlb_enabled(void)
if (ppc_swiotlb_enable) if (ppc_swiotlb_enable)
swiotlb_print_info(); swiotlb_print_info();
else else
swiotlb_free(); swiotlb_exit();
return 0; return 0;
} }

2
arch/x86/kernel/pci-swiotlb.c
View File

@ -120,7 +120,7 @@ void __init pci_swiotlb_late_init(void)
{ {
/* An IOMMU turned us off. */ /* An IOMMU turned us off. */
if (!swiotlb) if (!swiotlb)
swiotlb_free(); swiotlb_exit();
else { else {
printk(KERN_INFO "PCI-DMA: " printk(KERN_INFO "PCI-DMA: "
"Using software bounce buffering for IO (SWIOTLB)\n"); "Using software bounce buffering for IO (SWIOTLB)\n");

4
include/linux/swiotlb.h
View File

@ -115,10 +115,10 @@ extern int
swiotlb_dma_supported(struct device *hwdev, u64 mask); swiotlb_dma_supported(struct device *hwdev, u64 mask);
#ifdef CONFIG_SWIOTLB #ifdef CONFIG_SWIOTLB
extern void __init swiotlb_free(void); extern void __init swiotlb_exit(void);
unsigned int swiotlb_max_segment(void); unsigned int swiotlb_max_segment(void);
#else #else
static inline void swiotlb_free(void) { } static inline void swiotlb_exit(void) { }
static inline unsigned int swiotlb_max_segment(void) { return 0; } static inline unsigned int swiotlb_max_segment(void) { return 0; }
#endif #endif

2
lib/swiotlb.c
View File

@ -417,7 +417,7 @@ cleanup2:
return -ENOMEM; return -ENOMEM;
} }
void __init swiotlb_free(void) void __init swiotlb_exit(void)
{ {
if (!io_tlb_orig_addr) if (!io_tlb_orig_addr)
return; return;