Merge tag 'dma-mapping-6.6-2023-10-28' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:

- reduce the initialy dynamic swiotlb size to remove an annoying but
harmless warning from the page allocator (Petr Tesarik)

* tag 'dma-mapping-6.6-2023-10-28' of git://git.infradead.org/users/hch/dma-mapping:
swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages

Changed files
+5
kernel
dma
+5
kernel/dma/swiotlb.c
··· 678 678 size_t pool_size; 679 679 size_t tlb_size; 680 680 681 + if (nslabs > SLABS_PER_PAGE << MAX_ORDER) { 682 + nslabs = SLABS_PER_PAGE << MAX_ORDER; 683 + nareas = limit_nareas(nareas, nslabs); 684 + } 685 + 681 686 pool_size = sizeof(*pool) + array_size(sizeof(*pool->areas), nareas); 682 687 pool = kzalloc(pool_size, gfp); 683 688 if (!pool)