diff options
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r-- | arch/arm64/mm/dma-mapping.c | 6 | ||||
-rw-r--r-- | arch/arm64/mm/init.c | 5 | ||||
-rw-r--r-- | arch/arm64/mm/mm.h | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 5eb244453a5b..4bd7579ec9e6 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c | |||
@@ -61,12 +61,10 @@ static struct dma_map_ops arm64_swiotlb_dma_ops = { | |||
61 | .mapping_error = swiotlb_dma_mapping_error, | 61 | .mapping_error = swiotlb_dma_mapping_error, |
62 | }; | 62 | }; |
63 | 63 | ||
64 | void __init swiotlb_init_with_default_size(size_t default_size, int verbose); | 64 | void __init arm64_swiotlb_init(void) |
65 | |||
66 | void __init arm64_swiotlb_init(size_t max_size) | ||
67 | { | 65 | { |
68 | dma_ops = &arm64_swiotlb_dma_ops; | 66 | dma_ops = &arm64_swiotlb_dma_ops; |
69 | swiotlb_init_with_default_size(min((size_t)SZ_64M, max_size), 1); | 67 | swiotlb_init(1); |
70 | } | 68 | } |
71 | 69 | ||
72 | #define PREALLOC_DMA_DEBUG_ENTRIES 4096 | 70 | #define PREALLOC_DMA_DEBUG_ENTRIES 4096 |
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 5f719ba949bc..efbf7df05d3f 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c | |||
@@ -301,10 +301,7 @@ void __init mem_init(void) | |||
301 | unsigned long reserved_pages, free_pages; | 301 | unsigned long reserved_pages, free_pages; |
302 | struct memblock_region *reg; | 302 | struct memblock_region *reg; |
303 | 303 | ||
304 | #if CONFIG_SWIOTLB | 304 | arm64_swiotlb_init(); |
305 | extern void __init arm64_swiotlb_init(size_t max_size); | ||
306 | arm64_swiotlb_init(max_pfn << (PAGE_SHIFT - 1)); | ||
307 | #endif | ||
308 | 305 | ||
309 | max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map; | 306 | max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map; |
310 | 307 | ||
diff --git a/arch/arm64/mm/mm.h b/arch/arm64/mm/mm.h index d8d6e7851c14..916701e6d040 100644 --- a/arch/arm64/mm/mm.h +++ b/arch/arm64/mm/mm.h | |||
@@ -1,2 +1,3 @@ | |||
1 | extern void __flush_dcache_page(struct page *page); | 1 | extern void __flush_dcache_page(struct page *page); |
2 | extern void __init bootmem_init(void); | 2 | extern void __init bootmem_init(void); |
3 | extern void __init arm64_swiotlb_init(void); | ||