Commit c15f6d8d authored May 03, 2018 by Linus Torvalds

dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix an incorrect warning selection introduced in the last merge
  window"

* tag 'dma-mapping-4.17-4' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: fix inversed DMA_ATTR_NO_WARN test

parents f4ef6a43 892a0be4

lib/swiotlb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -737,7 +737,7 @@ out_unmap:
		swiotlb_tbl_unmap_single(dev, phys_addr, size, DMA_TO_DEVICE,
		DMA_ATTR_SKIP_CPU_SYNC);
		out_warn:
		if ((attrs & DMA_ATTR_NO_WARN) && printk_ratelimit()) {
		if (!(attrs & DMA_ATTR_NO_WARN) && printk_ratelimit()) {
		dev_warn(dev,
		"swiotlb: coherent allocation failed, size=%zu\n",
		size);

Admin message