diff options
| author | Ross Lagerwall <ross.lagerwall@citrix.com> | 2023-09-11 12:32:51 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2023-09-13 14:13:15 +0200 |
| commit | a6a241764f69c62d23fc6960920cc662ae4069e9 (patch) | |
| tree | 9199ccaf9a9fc14e40dbf6899663283aff538d7f /kernel/dma/swiotlb.c | |
| parent | Linux 6.6-rc1 (diff) | |
| download | linux-a6a241764f69c62d23fc6960920cc662ae4069e9.tar.xz linux-a6a241764f69c62d23fc6960920cc662ae4069e9.zip | |
swiotlb: use the calculated number of areas
Commit 8ac04063354a ("swiotlb: reduce the number of areas to match
actual memory pool size") calculated the reduced number of areas in
swiotlb_init_remap() but didn't actually use the value. Replace usage of
default_nareas accordingly.
Fixes: 8ac04063354a ("swiotlb: reduce the number of areas to match actual memory pool size")
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'kernel/dma/swiotlb.c')
| -rw-r--r-- | kernel/dma/swiotlb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 394494a6b1f3..85dd94323b98 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -399,14 +399,13 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags, } mem->areas = memblock_alloc(array_size(sizeof(struct io_tlb_area), - default_nareas), SMP_CACHE_BYTES); + nareas), SMP_CACHE_BYTES); if (!mem->areas) { pr_warn("%s: Failed to allocate mem->areas.\n", __func__); return; } - swiotlb_init_io_tlb_pool(mem, __pa(tlb), nslabs, false, - default_nareas); + swiotlb_init_io_tlb_pool(mem, __pa(tlb), nslabs, false, nareas); add_mem_pool(&io_tlb_default_mem, mem); if (flags & SWIOTLB_VERBOSE) |