diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-05 09:49:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-05 09:49:21 -0700 |
| commit | 4fbcf58590a85cdabc48c1541d4f7031b22829f0 (patch) | |
| tree | 1ecf7a092ef5492a86fc5a03f2c8668c257ef307 | |
| parent | 61ccc8c3e59a8bf0b0ae046bbd72bd23846b5fa2 (diff) | |
| parent | 75961ffb5cb3e5196f19cae7683f35cc88b50800 (diff) | |
Merge tag 'dma-mapping-6.9-2024-05-04' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fix from Christoph Hellwig:
- fix the combination of restricted pools and dynamic swiotlb
(Will Deacon)
* tag 'dma-mapping-6.9-2024-05-04' of git://git.infradead.org/users/hch/dma-mapping:
swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y
| -rw-r--r-- | kernel/dma/swiotlb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index a5e0dfc44d24..0de66f0ff43a 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -1798,6 +1798,7 @@ static int rmem_swiotlb_device_init(struct reserved_mem *rmem, mem->for_alloc = true; #ifdef CONFIG_SWIOTLB_DYNAMIC spin_lock_init(&mem->lock); + INIT_LIST_HEAD_RCU(&mem->pools); #endif add_mem_pool(mem, pool); |