diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
index 882cd70c7a2f..a6cf55c6fd55 100644
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
@@ -125,7 +125,7 @@ static int __init xen_mm_init(void)
return 0;
/* we can work with the default swiotlb */
- rc = swiotlb_init_late(swiotlb_size_or_default(),
+ rc = swiotlb_init_late(swiotlb_default_pool_size(),
xen_swiotlb_gfp(), NULL);
if (rc < 0)
return rc;
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index fbf215ecc7d0..0842098a279b 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -348,7 +348,7 @@ void __init arch_mm_preinit(void)
unsigned long size =
DIV_ROUND_UP(memblock_phys_mem_size(), 1024);
- swiotlb_adjust_size(min(swiotlb_size_or_default(), size));
+ swiotlb_adjust_size(min(swiotlb_default_pool_size(), size));
}
swiotlb_init(true, flags);
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index fb37b0b67efe..5fa392021717 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -185,7 +185,7 @@ void __init arch_mm_preinit(void)
*/
unsigned long size =
DIV_ROUND_UP(memblock_phys_mem_size(), 1024);
- swiotlb_adjust_size(min(swiotlb_size_or_default(), size));
+ swiotlb_adjust_size(min(swiotlb_default_pool_size(), size));
swiotlb = true;
swiotlb_flags |= SWIOTLB_ANY;
}
diff --git a/arch/x86/include/asm/crash_reserve.h b/arch/x86/include/asm/crash_reserve.h
index 7835b2cdff04..047f638a766d 100644
--- a/arch/x86/include/asm/crash_reserve.h
+++ b/arch/x86/include/asm/crash_reserve.h
@@ -18,7 +18,7 @@
* no good way to detect the paging mode of the target kernel which will be
* loaded for dumping.
*/
-extern unsigned long swiotlb_size_or_default(void);
+extern unsigned long swiotlb_default_pool_size(void);
#ifdef CONFIG_X86_32
# define CRASH_ADDR_LOW_MAX SZ_512M
@@ -33,7 +33,7 @@ extern unsigned long swiotlb_size_or_default(void);
static inline unsigned long crash_low_size_default(void)
{
#ifdef CONFIG_X86_64
- return max(swiotlb_size_or_default() + (8UL << 20), 256UL << 20);
+ return max(swiotlb_default_pool_size() + (8UL << 20), 256UL << 20);
#else
return 0;
#endifdiff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 2a421241b980..5f24edf47b68 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -38,7 +38,7 @@ struct scatterlist;
#define IO_TLB_DEFAULT_SIZE (64UL << 20)
#endif
-unsigned long swiotlb_size_or_default(void);
+unsigned long swiotlb_default_pool_size(void);
void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
int (*remap)(void *tlb, unsigned long nslabs));
int swiotlb_init_late(size_t size, gfp_t gfp_mask,
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index ded7016a46a7..42c51fb57e12 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -285,7 +285,7 @@ setup_io_tlb_npages(char *str)
}
early_param("swiotlb", setup_io_tlb_npages);
-unsigned long swiotlb_size_or_default(void)
+unsigned long swiotlb_default_pool_size(void)
{
return default_nslabs << IO_TLB_SHIFT;
}--
2.43.0