Skip to content

Commit 4fbcf58

Browse files
committed
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
2 parents 61ccc8c + 75961ff commit 4fbcf58

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

kernel/dma/swiotlb.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,6 +1798,7 @@ static int rmem_swiotlb_device_init(struct reserved_mem *rmem,
17981798
mem->for_alloc = true;
17991799
#ifdef CONFIG_SWIOTLB_DYNAMIC
18001800
spin_lock_init(&mem->lock);
1801+
INIT_LIST_HEAD_RCU(&mem->pools);
18011802
#endif
18021803
add_mem_pool(mem, pool);
18031804

0 commit comments

Comments
 (0)