From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Dec 2022 17:05:19 +0000 (-0800)
Subject: Merge tag 'dma-mapping-6.2-2022-12-13' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e529d3507a93d3c9528580081bbaf931a50de154;p=linux.git

Merge tag 'dma-mapping-6.2-2022-12-13' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - reduce the swiotlb buffer size on allocation failure (Alexey
   Kardashevskiy)

 - clean up passing of bogus GFP flags to the dma-coherent allocator
   (Christoph Hellwig)

* tag 'dma-mapping-6.2-2022-12-13' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: reject __GFP_COMP in dma_alloc_attrs
  ALSA: memalloc: don't pass bogus GFP_ flags to dma_alloc_*
  s390/ism: don't pass bogus GFP_ flags to dma_alloc_coherent
  cnic: don't pass bogus GFP_ flags to dma_alloc_coherent
  RDMA/qib: don't pass bogus GFP_ flags to dma_alloc_coherent
  RDMA/hfi1: don't pass bogus GFP_ flags to dma_alloc_coherent
  media: videobuf-dma-contig: use dma_mmap_coherent
  swiotlb: reduce the swiotlb buffer size on allocation failure
---

e529d3507a93d3c9528580081bbaf931a50de154
diff --cc sound/core/memalloc.c
index ba095558b6d16,fe03cf796e8bb..34250e6022ff3
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@@ -543,9 -541,9 +542,9 @@@ static void *snd_dma_noncontig_alloc(st
  	void *p;
  
  	sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir,
- 				      DEFAULT_GFP, 0);
+ 				      DEFAULT_GFP | __GFP_COMP, 0);
 -	if (!sgt) {
  #ifdef CONFIG_SND_DMA_SGBUF
 +	if (!sgt && !get_dma_ops(dmab->dev.dev)) {
  		if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG)
  			dmab->dev.type = SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK;
  		else